tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / rules-attr-dynchange1-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/rules-attr-dynchange1-expected.txt b/LayoutTests/platform/efl/fast/table/rules-attr-dynchange1-expected.txt
index 26e33ca..15f3d4e 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/rules-attr-dynchange1-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/rules-attr-dynchange1-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderTable {TABLE} at (0,0) size 115x50 [border: none]
         RenderTableSection {TBODY} at (0,0) size 114x49
@@ -29,3 +30,32 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,62) size 784x14
         RenderText {#text} at (0,0) size 579x14
           text run at (0,0) width 579: "The rules attribute is first set dynamically to rows, then to cols, so the table should show only column borders. Bug 14848."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderTable {TABLE} at (0,0) size 153x65 [border: none]
+        RenderTableSection {TBODY} at (0,0) size 152x64
+          RenderTableRow {TR} at (0,0) size 152x22
+            RenderTableCell {TD} at (0,0) size 76x22 [border: (1px none #808080) none none (1px solid #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 73x19
+                text run at (2,2) width 73: "Row1 cell1"
+            RenderTableCell {TD} at (76,0) size 76x22 [border: (1px none #808080) none none (1px solid #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 73x19
+                text run at (2,2) width 73: "Row1 cell2"
+          RenderTableRow {TR} at (0,22) size 152x21
+            RenderTableCell {TD} at (0,22) size 76x21 [border: none none none (1px solid #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 73x19
+                text run at (2,1) width 73: "Row2 cell1"
+            RenderTableCell {TD} at (76,22) size 76x21 [border: none none none (1px solid #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 73x19
+                text run at (2,1) width 73: "Row2 cell2"
+          RenderTableRow {TR} at (0,43) size 152x21
+            RenderTableCell {TD} at (0,43) size 76x21 [border: none none none (1px solid #808080)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 73x19
+                text run at (2,1) width 73: "Row3 cell1"
+            RenderTableCell {TD} at (76,43) size 76x21 [border: none none none (1px solid #808080)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 73x19
+                text run at (2,1) width 73: "Row3 cell2"
+      RenderBlock {P} at (0,81) size 784x19
+        RenderText {#text} at (0,0) size 769x19
+          text run at (0,0) width 769: "The rules attribute is first set dynamically to rows, then to cols, so the table should show only column borders. Bug 14848."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d