tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_valign_bottom-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_valign_bottom-expected.txt
index f061eb5..3eccba4 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_valign_bottom-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/x_th_valign_bottom-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x259
   RenderBlock {html} at (0,0) size 800x259
     RenderBody {body} at (8,12) size 784x239
@@ -19,3 +20,25 @@ layer at (0,0) size 800x259
                 text run at (6,16) width 173: "fill x-fill x-fill x-fill x-fill x-fill x-fill "
                 text run at (178,16) width 235: "x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill "
                 text run at (412,16) width 154: "x-fill x-fill x-fill x-fill x-fill x-fill"
+=======
+layer at (0,0) size 800x273
+  RenderBlock {html} at (0,0) size 800x273
+    RenderBody {body} at (8,16) size 784x249
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 167x19
+          text run at (0,0) width 167: "TH VALIGN=BOTTOM"
+      RenderTable {table} at (0,35) size 784x214 [border: (1px outset #808080)]
+        RenderTableSection (anonymous) at (1,1) size 782x212
+          RenderTableRow {tr} at (0,2) size 782x208
+            RenderTableCell {th} at (2,2) size 204x208 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderImage {img} at (2,2) size 200x200
+            RenderTableCell {th} at (208,149) size 572x61 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (6,2) size 560x57
+                text run at (6,2) width 293: "The bottom of this text should be vertically "
+                text run at (298,2) width 268: "aligned to the bottom of the image. x-fill"
+                text run at (7,21) width 103: "x-fill x-fill x-fill "
+                text run at (109,21) width 307: "x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill "
+                text run at (415,21) width 150: "x-fill x-fill x-fill x-fill x-"
+                text run at (107,40) width 158: "fill x-fill x-fill x-fill x-fill "
+                text run at (264,40) width 201: "x-fill x-fill x-fill x-fill x-fill x-fill"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d