tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug5538-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug5538-expected.txt
index 025b0cf..35a02bd 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug5538-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug5538-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580 [bgcolor=#FFFFFF]
       RenderBlock {H3} at (0,0) size 784x16
         RenderText {#text} at (0,0) size 229x15
@@ -17,10 +18,28 @@ layer at (0,0) size 800x600
                 RenderImage {IMG} at (0,0) size 128x89
             RenderTableCell {TD} at (128,44) size 472x0 [r=0 c=1 rs=1 cs=1]
       RenderTable {TABLE} at (0,119) size 600x18
+=======
+    RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#FFFFFF]
+      RenderBlock {H3} at (0,0) size 784x22
+        RenderText {#text} at (0,0) size 307x22
+          text run at (0,0) width 307: "Testcase for bug 5538 - distilled from "
+        RenderInline {A} at (0,0) size 117x22 [color=#0000EE]
+          RenderText {#text} at (307,0) size 117x22
+            text run at (307,0) width 117: "www.fool.com"
+      RenderTable {TABLE} at (0,40) size 600x89
+        RenderTableSection {TBODY} at (0,0) size 600x89
+          RenderTableRow {TR} at (0,0) size 600x89
+            RenderTableCell {TD} at (0,0) size 128x89 [bgcolor=#336699] [r=0 c=0 rs=1 cs=1]
+              RenderInline {A} at (0,0) size 128x19 [color=#0000EE]
+                RenderImage {IMG} at (0,0) size 128x89
+            RenderTableCell {TD} at (128,44) size 472x0 [r=0 c=1 rs=1 cs=1]
+      RenderTable {TABLE} at (0,129) size 600x18
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (0,0) size 600x18
           RenderTableRow {TR} at (0,0) size 600x18
             RenderTableCell {TD} at (0,0) size 600x18 [r=0 c=0 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 348x18
+<<<<<<< HEAD
               RenderInline {MAP} at (0,0) size 0x14
               RenderImage {IMG} at (348,0) size 88x18
               RenderImage {IMG} at (436,0) size 55x18
@@ -34,12 +53,31 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (289,25) size 0x0
           RenderBR {BR} at (0,28) size 0x14
         RenderTable {TABLE} at (0,42) size 600x89
+=======
+              RenderInline {MAP} at (0,0) size 0x19
+              RenderImage {IMG} at (348,0) size 88x18
+              RenderImage {IMG} at (436,0) size 55x18
+      RenderBlock {P} at (0,163) size 784x164
+        RenderBlock (anonymous) at (0,0) size 784x57
+          RenderText {#text} at (0,0) size 471x19
+            text run at (0,0) width 471: "When removing <A HREF=\"...\"> surrounding logo image in first row and"
+          RenderBR {BR} at (471,15) size 0x0
+          RenderText {#text} at (0,19) size 384x19
+            text run at (0,19) width 384: "removing <MAP> element in second row it looks OK to me:"
+          RenderBR {BR} at (384,34) size 0x0
+          RenderBR {BR} at (0,38) size 0x19
+        RenderTable {TABLE} at (0,57) size 600x89
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderTableSection {TBODY} at (0,0) size 600x89
             RenderTableRow {TR} at (0,0) size 600x89
               RenderTableCell {TD} at (0,0) size 128x89 [bgcolor=#336699] [r=0 c=0 rs=1 cs=1]
                 RenderImage {IMG} at (0,0) size 128x89
               RenderTableCell {TD} at (128,44) size 472x0 [r=0 c=1 rs=1 cs=1]
+<<<<<<< HEAD
         RenderTable {TABLE} at (0,131) size 600x18
+=======
+        RenderTable {TABLE} at (0,146) size 600x18
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderTableSection {TBODY} at (0,0) size 600x18
             RenderTableRow {TR} at (0,0) size 600x18
               RenderTableCell {TD} at (0,0) size 600x18 [r=0 c=0 rs=1 cs=1]