tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4576-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4576-expected.txt
index 6c6a78d..8171412 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4576-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4576-expected.txt
@@ -9,7 +9,11 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,222) size 98x2 [r=0 c=0 rs=1 cs=1]
             RenderTableCell {TD} at (102,2) size 32x442 [r=0 c=1 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 30x440
+<<<<<<< HEAD
             RenderTableCell {TD} at (136,71) size 462x304 [r=0 c=2 rs=1 cs=1]
+=======
+            RenderTableCell {TD} at (136,63) size 462x319 [r=0 c=2 rs=1 cs=1]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               RenderTable {TABLE} at (1,1) size 460x230
                 RenderTableSection {TBODY} at (0,0) size 460x230
                   RenderTableRow {TR} at (0,2) size 460x226
@@ -19,14 +23,22 @@ layer at (0,0) size 800x600
                           RenderTableRow {TR} at (0,2) size 250x87
                             RenderTableCell {TD} at (2,2) size 246x87 [r=0 c=0 rs=1 cs=1]
                               RenderImage {IMG} at (1,1) size 93x85
+<<<<<<< HEAD
                               RenderText {#text} at (97,1) size 130x28
                                 text run at (97,1) width 130: "Text text, text: text text text;"
                                 text run at (97,15) width 99: "text. Text, text text...."
+=======
+                              RenderText {#text} at (97,1) size 145x57
+                                text run at (97,1) width 145: "Text text, text: text text"
+                                text run at (97,20) width 122: "text; text. Text, text"
+                                text run at (97,39) width 39: "text...."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                     RenderTableCell {TD} at (256,2) size 202x226 [r=0 c=1 rs=1 cs=1]
                       RenderTable {TABLE} at (1,1) size 200x224 [border: (10px outset #808080)]
                         RenderTableSection {TBODY} at (10,10) size 180x204
                           RenderTableRow {TR} at (0,2) size 180x200
                             RenderTableCell {TD} at (2,100) size 176x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+<<<<<<< HEAD
               RenderBlock (anonymous) at (1,231) size 460x28
                 RenderBR {BR} at (0,0) size 0x14
                 RenderText {#text} at (0,14) size 80x14
@@ -45,3 +57,23 @@ layer at (0,0) size 800x600
                       RenderBlock {DIV} at (2,2) size 46x34 [border: (10px groove #008000)]
                         RenderText {#text} at (10,10) size 6x14
                           text run at (10,10) width 6: "x"
+=======
+              RenderBlock (anonymous) at (1,231) size 460x38
+                RenderBR {BR} at (0,0) size 0x19
+                RenderText {#text} at (0,19) size 106x19
+                  text run at (0,19) width 106: "This is bug 2904"
+              RenderTable {TABLE} at (1,269) size 62x49 [border: (1px outset #808080)]
+                RenderTableSection {TBODY} at (1,1) size 60x47
+                  RenderTableRow {TR} at (0,2) size 60x43
+                    RenderTableCell {TD} at (2,7) size 22x33 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                      RenderTable {TABLE} at (2,2) size 18x29 [border: (1px outset #808080)]
+                        RenderTableSection {TBODY} at (1,1) size 16x27
+                          RenderTableRow {TR} at (0,2) size 16x23
+                            RenderTableCell {TD} at (2,2) size 12x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                              RenderText {#text} at (2,2) size 8x19
+                                text run at (2,2) width 8: "x"
+                    RenderTableCell {TD} at (26,2) size 32x43 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+                      RenderBlock {DIV} at (2,2) size 48x39 [border: (10px groove #008000)]
+                        RenderText {#text} at (10,10) size 8x19
+                          text run at (10,10) width 8: "x"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d