tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug82946-1-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug82946-1-expected.txt
index 4ac2b9b..18aae74 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug82946-1-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug82946-1-expected.txt
@@ -3,6 +3,7 @@ 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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 630x14
           text run at (0,0) width 630: "The image below has a width of 459px. When the table below it has a width of 459px or greater, the bottom row overlaps the top row"
@@ -37,3 +38,42 @@ layer at (0,0) size 800x600
                 text run at (2,30) width 98: "standards, including "
                 text run at (100,30) width 562: "XSL, XSLT, XPath, XQuery, XLink, XPointer, XHTML, HyTime, DSSSL, CSS, SPDL, SVG, CGM, ISO-HTML, "
                 text run at (662,30) width 52: "and others."
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 767x38
+          text run at (0,0) width 767: "The image below has a width of 459px. When the table below it has a width of 459px or greater, the bottom row overlaps"
+          text run at (0,19) width 72: "the top row"
+      RenderBlock (anonymous) at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 141x19
+          text run at (0,0) width 141: "Table with width=459"
+        RenderBR {BR} at (141,15) size 0x0
+      RenderTable {TABLE} at (0,73) size 784x260 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 782x258
+          RenderTableRow {TR} at (0,2) size 782x153
+            RenderTableCell {TD} at (2,117) size 49x23 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]
+              RenderText {#text} at (2,2) size 45x19
+                text run at (2,2) width 45: "sidebar"
+            RenderTableCell {TD} at (53,2) size 727x153 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (2,2) size 723x120
+                RenderImage {IMG} at (0,0) size 459x120
+                RenderText {#text} at (0,0) size 0x0
+              RenderTable {TABLE} at (2,122) size 459x29 [border: (1px outset #808080)]
+                RenderTableSection {TBODY} at (1,1) size 457x27
+                  RenderTableRow {TR} at (0,2) size 457x23
+                    RenderTableCell {TD} at (2,2) size 453x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (2,2) size 127x19
+                        text run at (2,2) width 127: "THIS IS A TABLE"
+          RenderTableRow {TR} at (0,157) size 782x99
+            RenderTableCell {TD} at (53,157) size 727x99 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 719x95
+                text run at (2,2) width 588: "The XML Cover Pages is a comprehensive online reference work for the Extensible Markup "
+                text run at (590,2) width 113: "Language (XML)"
+                text run at (2,21) width 376: "and its parent, the Standard Generalized Markup Language "
+                text run at (378,21) width 331: "(SGML). The reference collection features extensive"
+                text run at (2,40) width 140: "documentation on the "
+                text run at (142,40) width 495: "application of the open, interoperable \"markup language\" standards, including "
+                text run at (637,40) width 84: "XSL, XSLT,"
+                text run at (2,59) width 663: "XPath, XQuery, XLink, XPointer, XHTML, HyTime, DSSSL, CSS, SPDL, SVG, CGM, ISO-HTML, "
+                text run at (665,59) width 23: "and"
+                text run at (2,78) width 42: "others."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d