tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / marvin / tr_bgcolor_white_rgb-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.txt
index 9c53b9e..87c9b9d 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#FF0000]
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 328x14
           text run at (0,0) width 328: "Table with one white row and one red row. This tests the color white."
@@ -28,3 +29,30 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (62,22) size 28x18 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (2,2) size 24x14
                 text run at (2,2) width 24: "        "
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 439x19
+          text run at (0,0) width 439: "Table with one white row and one red row. This tests the color white."
+      RenderTable {TABLE} at (0,35) size 118x54 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 116x52
+          RenderTableRow {TR} at (0,2) size 116x23 [bgcolor=#FFFFFF]
+            RenderTableCell {TD} at (2,2) size 36x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+            RenderTableCell {TD} at (40,2) size 36x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+            RenderTableCell {TD} at (78,2) size 36x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+          RenderTableRow {TR} at (0,27) size 116x23
+            RenderTableCell {TD} at (2,27) size 36x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+            RenderTableCell {TD} at (40,27) size 36x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+            RenderTableCell {TD} at (78,27) size 36x23 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 32x19
+                text run at (2,2) width 32: "        "
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d