tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug45055-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug45055-expected.txt
index 82ab369..44db54c 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug45055-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug45055-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x204
   RenderBlock {HTML} at (0,0) size 800x204
     RenderBody {BODY} at (8,8) size 784x188 [bgcolor=#FFFFFF]
@@ -49,3 +50,54 @@ layer at (0,0) size 800x204
             RenderTableCell {TD} at (1,171) size 38x16 [color=#0000FF] [bgcolor=#CCCCCC] [r=10 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 36x14
                 text run at (1,1) width 36: "Line 11"
+=======
+layer at (0,0) size 800x259
+  RenderBlock {HTML} at (0,0) size 800x259
+    RenderBody {BODY} at (8,8) size 784x243 [bgcolor=#FFFFFF]
+      RenderTable {TABLE} at (0,0) size 53x243
+        RenderTableSection {TBODY} at (0,0) size 53x243
+          RenderTableRow {TR} at (0,1) size 53x21
+            RenderTableCell {TD} at (1,1) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 1"
+          RenderTableRow {TR} at (0,23) size 53x21
+            RenderTableCell {TD} at (1,23) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 2"
+          RenderTableRow {TR} at (0,45) size 53x21
+            RenderTableCell {TD} at (1,45) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 3"
+          RenderTableRow {TR} at (0,67) size 53x21
+            RenderTableCell {TD} at (1,67) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 4"
+          RenderTableRow {TR} at (0,89) size 53x21
+            RenderTableCell {TD} at (1,89) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=4 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 5"
+          RenderTableRow {TR} at (0,111) size 53x21
+            RenderTableCell {TD} at (1,111) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=5 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 6"
+          RenderTableRow {TR} at (0,133) size 53x21
+            RenderTableCell {TD} at (1,133) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=6 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 7"
+          RenderTableRow {TR} at (0,155) size 53x21
+            RenderTableCell {TD} at (1,155) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=7 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 8"
+          RenderTableRow {TR} at (0,177) size 53x21
+            RenderTableCell {TD} at (1,177) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=8 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 41x19
+                text run at (1,1) width 41: "Line 9"
+          RenderTableRow {TR} at (0,199) size 53x21
+            RenderTableCell {TD} at (1,199) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=9 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 49x19
+                text run at (1,1) width 49: "Line 10"
+          RenderTableRow {TR} at (0,221) size 53x21
+            RenderTableCell {TD} at (1,221) size 51x21 [color=#0000FF] [bgcolor=#CCCCCC] [r=10 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 49x19
+                text run at (1,1) width 49: "Line 11"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d