tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
index 918033b..b3c54df 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-69-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 800x180
   RenderBlock {HTML} at (0,0) size 800x180
     RenderBody {BODY} at (8,12) size 784x160
@@ -38,3 +39,43 @@ layer at (0,0) size 800x180
             RenderTableCell {TD} at (70,104) size 30x16 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 23x14
                 text run at (1,1) width 23: "none"
+=======
+layer at (0,0) size 800x229
+  RenderBlock {HTML} at (0,0) size 800x229
+    RenderBody {BODY} at (8,16) size 784x205
+      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 125x170
+        RenderTableSection {TBODY} at (0,0) size 125x170
+          RenderTableRow {TR} at (0,0) size 125x55
+            RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (38,14) size 49x26 [border: none] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (87,17) size 38x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+          RenderTableRow {TR} at (0,55) size 125x60
+            RenderTableCell {TD} at (0,74) size 38x21 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (38,69) size 49x31 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 37x19
+                text run at (6,6) width 37: "outset"
+            RenderTableCell {TD} at (87,74) size 38x21 [border: none] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,1) size 31x19
+                text run at (6,1) width 31: "none"
+          RenderTableRow {TR} at (0,115) size 125x55
+            RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (38,129) size 49x26 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,6) size 31x19
+                text run at (1,6) width 31: "none"
+            RenderTableCell {TD} at (87,132) size 38x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d