tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t170602-bdr-conflct-w-80-d-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
index e1f14ea..6bba6b2 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-80-d-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x160
   RenderBlock {HTML} at (0,0) size 800x160
     RenderBody {BODY} at (8,12) size 784x140
@@ -38,3 +39,43 @@ layer at (0,0) size 800x160
             RenderTableCell {TD} at (68,87) size 34x16 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 32x14
                 text run at (1,1) width 32: "hidden"
+=======
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 317x19
+          text run at (0,0) width 317: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 135x150
+        RenderTableSection {TBODY} at (0,0) size 135x150
+          RenderTableRow {TR} at (0,0) size 135x50
+            RenderTableCell {TD} at (0,14) size 45x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (45,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (90,14) size 45x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+          RenderTableRow {TR} at (0,50) size 135x50
+            RenderTableCell {TD} at (0,64) size 45x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (45,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 29x19
+                text run at (1,1) width 29: "inset"
+            RenderTableCell {TD} at (90,64) size 45x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+          RenderTableRow {TR} at (0,100) size 135x50
+            RenderTableCell {TD} at (0,114) size 45x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (45,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (90,114) size 45x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d