tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug625-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug625-expected.txt
index 69ecba0..068720e 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug625-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug625-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 1012x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
@@ -22,3 +23,29 @@ layer at (0,0) size 800x600
               RenderBR {BR} at (252,172) size 0x0
               RenderText {#text} at (0,172) size 55x14
                 text run at (0,172) width 55: "Click Here!"
+=======
+layer at (0,0) size 1012x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585
+  RenderBlock {HTML} at (0,0) size 800x585
+    RenderBody {BODY} at (8,8) size 784x569
+      RenderBlock {HR} at (0,0) size 1004x4 [border: (2px solid #000000)]
+      RenderBlock (anonymous) at (0,12) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderTable {TABLE} at (0,31) size 642x218
+        RenderTableSection {TBODY} at (0,0) size 642x218
+          RenderTableRow {TR} at (0,0) size 642x27
+            RenderTableCell {TD} at (0,0) size 642x27 [r=0 c=0 rs=1 cs=3]
+              RenderImage {IMG} at (0,0) size 642x27 [border: (1px solid #000000)]
+          RenderTableRow {TR} at (0,27) size 642x191
+            RenderTableCell {TD} at (0,82) size 150x80 [r=1 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 102x80 [border: (1px solid #000000)]
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (150,122) size 67x1 [r=1 c=1 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 40x1
+            RenderTableCell {TD} at (217,27) size 425x191 [r=1 c=2 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 252x172 [border: (1px solid #000000)]
+              RenderBR {BR} at (252,172) size 0x0
+              RenderText {#text} at (0,172) size 74x19
+                text run at (0,172) width 74: "Click Here!"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d