tizen beta release

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

diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
index 6fa587f..70f5e5a 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-86-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 (73,106) size 37x21 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (4,4) size 28x14
                 text run at (4,4) width 28: "outset"
+=======
+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 142x180 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 137x175
+          RenderTableRow {TR} at (0,0) size 137x58
+            RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+            RenderTableCell {TD} at (47,14) size 44x29 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+            RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+          RenderTableRow {TR} at (0,58) size 137x60
+            RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+            RenderTableCell {TD} at (47,72) size 44x31 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,6) size 29x19
+                text run at (6,6) width 29: "inset"
+            RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (6,4) size 37x19
+                text run at (6,4) width 37: "outset"
+          RenderTableRow {TR} at (0,118) size 137x57
+            RenderTableCell {TD} at (0,133) size 47x26 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+            RenderTableCell {TD} at (47,132) size 44x28 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (4,6) size 37x19
+                text run at (4,6) width 37: "outset"
+            RenderTableCell {TD} at (91,133) size 46x26 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 37x19
+                text run at (4,4) width 37: "outset"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d