tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / bugs / bug16012-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug16012-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug16012-expected.txt
index d7a618b..a44bb9c 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug16012-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug16012-expected.txt
@@ -3,24 +3,40 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,0) size 784x28
         RenderText {#text} at (0,0) size 196x14
           text run at (0,0) width 196: "Tables: both lines should be 1 pixel thick."
         RenderBR {BR} at (196,11) size 0x0
         RenderBR {BR} at (0,14) size 0x14
       RenderTable {TABLE} at (0,28) size 37x5
+=======
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 262x19
+          text run at (0,0) width 262: "Tables: both lines should be 1 pixel thick."
+        RenderBR {BR} at (262,15) size 0x0
+        RenderBR {BR} at (0,19) size 0x19
+      RenderTable {TABLE} at (0,38) size 37x5
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (0,0) size 37x5
           RenderTableRow {TR} at (0,2) size 37x1
             RenderTableCell {TD} at (2,2) size 31x1 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 30x1
             RenderTableCell {TD} at (35,2) size 0x0 [r=0 c=1 rs=1 cs=1]
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,33) size 784x14
         RenderBR {BR} at (0,0) size 0x14
       RenderTable {TABLE} at (0,47) size 34x5
+=======
+      RenderBlock (anonymous) at (0,43) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderTable {TABLE} at (0,62) size 34x5
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (0,0) size 34x5
           RenderTableRow {TR} at (0,2) size 34x1
             RenderTableCell {TD} at (2,2) size 30x1 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 30x1
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,52) size 784x138
         RenderBR {BR} at (0,0) size 0x14
         RenderBR {BR} at (0,14) size 0x14
@@ -46,3 +62,30 @@ layer at (0,0) size 800x600
             text run at (0,114) width 69: "Available NOW! "
         RenderBR {BR} at (69,122) size 0x0
         RenderBR {BR} at (0,124) size 0x14
+=======
+      RenderBlock (anonymous) at (0,67) size 784x185
+        RenderBR {BR} at (0,0) size 0x19
+        RenderBR {BR} at (0,19) size 0x19
+        RenderBR {BR} at (0,38) size 0x19
+        RenderText {#text} at (0,57) size 397x19
+          text run at (0,57) width 222: "2 texts, FACE=\"Arial, Helvetica\", "
+          text run at (222,57) width 175: "1st at size=0, 2nd at size=-4"
+        RenderBR {BR} at (397,72) size 0x0
+        RenderBR {BR} at (0,76) size 0x19
+        RenderInline {FONT} at (0,0) size 104x26
+          RenderText {#text} at (0,95) size 104x13
+            text run at (0,95) width 104: "Detonator 3.53 Drivers"
+          RenderBR {BR} at (104,105) size 0x0
+          RenderText {#text} at (0,108) size 75x13
+            text run at (0,108) width 75: "Available NOW! "
+        RenderBR {BR} at (75,118) size 0x0
+        RenderBR {BR} at (0,121) size 0x19
+        RenderInline {FONT} at (0,0) size 104x26
+          RenderText {#text} at (0,140) size 104x13
+            text run at (0,140) width 104: "Detonator 3.53 Drivers"
+          RenderBR {BR} at (104,150) size 0x0
+          RenderText {#text} at (0,153) size 75x13
+            text run at (0,153) width 75: "Available NOW! "
+        RenderBR {BR} at (75,163) size 0x0
+        RenderBR {BR} at (0,166) size 0x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d