tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / border-collapsing / 001-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/border-collapsing/001-expected.txt b/LayoutTests/platform/efl/fast/table/border-collapsing/001-expected.txt
index 7a97559..8ba743f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/border-collapsing/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/border-collapsing/001-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x366
   RenderBlock {HTML} at (0,0) size 800x366
     RenderBody {BODY} at (8,8) size 784x350
@@ -25,3 +26,30 @@ layer at (0,0) size 800x366
               RenderTableCell {TD} at (0,0) size 24x18 [border: (1px solid #000000)] [r=0 c=0 rs=1 cs=1]
                 RenderText {#text} at (2,2) size 20x14
                   text run at (2,2) width 20: "Test"
+=======
+layer at (0,0) size 800x426
+  RenderBlock {HTML} at (0,0) size 800x426
+    RenderBody {BODY} at (8,8) size 784x410
+      RenderBlock {DIV} at (0,0) size 784x223 [border: (10px dotted #0000FF)]
+        RenderTable {TABLE} at (10,10) size 322x203 [border: (5px solid #FF0000)]
+          RenderTableSection {TBODY} at (5,5) size 312x173
+            RenderTableRow {TR} at (0,0) size 312x41
+              RenderTableCell {TD} at (0,0) size 312x41 [border: (5px solid #008000)] [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (6,6) size 35x19
+                  text run at (6,6) width 35: "Hello"
+            RenderTableRow {TR} at (0,41) size 312x61
+              RenderTableCell {TD} at (0,41) size 312x61 [border: (15px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
+                RenderText {#text} at (16,16) size 59x19
+                  text run at (16,16) width 59: "Goodbye"
+            RenderTableRow {TR} at (0,102) size 312x71
+              RenderTableCell {TD} at (0,102) size 312x71 [border: (25px solid #FF0000)] [r=2 c=0 rs=1 cs=1]
+                RenderText {#text} at (26,26) size 59x19
+                  text run at (26,26) width 59: "Goodbye"
+      RenderBlock {DIV} at (0,383) size 784x27 [border: (1px solid #008000)]
+        RenderTable {TABLE} at (1,1) size 33x25 [border: (1px none #808080)]
+          RenderTableSection {TBODY} at (1,1) size 31x23
+            RenderTableRow {TR} at (0,0) size 31x23
+              RenderTableCell {TD} at (0,0) size 31x23 [border: (1px solid #000000)] [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (2,2) size 27x19
+                  text run at (2,2) width 27: "Test"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d