tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
index 676258a..1f5edf8 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-18-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 800x190
   RenderBlock {HTML} at (0,0) size 800x190
     RenderBody {BODY} at (8,12) size 784x170
@@ -38,3 +39,43 @@ layer at (0,0) size 800x190
             RenderTableCell {TD} at (76,106) size 31x21 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 22x14
                 text run at (4,4) width 22: "inset"
+=======
+layer at (0,0) size 800x239
+  RenderBlock {HTML} at (0,0) size 800x239
+    RenderBody {BODY} at (8,16) size 784x215
+      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 137x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 132x175
+          RenderTableRow {TR} at (0,0) size 132x58
+            RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+            RenderTableCell {TD} at (39,14) size 55x29 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+            RenderTableCell {TD} at (94,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+          RenderTableRow {TR} at (0,58) size 132x60
+            RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+            RenderTableCell {TD} at (39,72) size 55x31 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 43x19
+                text run at (6,6) width 43: "double"
+            RenderTableCell {TD} at (94,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 29x19
+                text run at (6,4) width 29: "inset"
+          RenderTableRow {TR} at (0,118) size 132x57
+            RenderTableCell {TD} at (0,133) size 39x26 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+            RenderTableCell {TD} at (39,132) size 55x28 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 29x19
+                text run at (4,6) width 29: "inset"
+            RenderTableCell {TD} at (94,133) size 38x26 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 29x19
+                text run at (4,4) width 29: "inset"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d