tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug51727-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug51727-expected.txt
index 516082e..3996063 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug51727-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug51727-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x118
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,8) size 784x102
@@ -20,3 +21,25 @@ layer at (0,0) size 800x118
             RenderTableCell {TD} at (2,2) size 79x18 [border: (1px solid #000000)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 10x14
                 text run at (2,2) width 10: "aa"
+=======
+layer at (0,0) size 800x125
+  RenderBlock {HTML} at (0,0) size 800x125
+    RenderBody {BODY} at (8,8) size 784x109
+      RenderBlock {FORM} at (0,0) size 784x82
+        RenderButton {INPUT} at (2,2) size 215x37 [color=#202020]
+          RenderBlock (anonymous) at (15,8) size 185x19
+            RenderText at (0,0) size 185x19
+              text run at (0,0) width 185: "(1) Fill cell with long string"
+        RenderBR {BR} at (219,10) size 0x19
+        RenderButton {INPUT} at (2,43) size 219x37 [color=#202020]
+          RenderBlock (anonymous) at (15,8) size 189x19
+            RenderText at (0,0) size 189x19
+              text run at (0,0) width 189: "(2) Fill cell with short string"
+        RenderBR {BR} at (223,51) size 0x19
+      RenderTable {TABLE} at (0,82) size 83x27
+        RenderTableSection {TBODY} at (0,0) size 83x27
+          RenderTableRow {TR} at (0,2) size 83x23
+            RenderTableCell {TD} at (2,2) size 79x23 [border: (1px solid #000000)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 14x19
+                text run at (2,2) width 14: "aa"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d