tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tr_valign_baseline-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tr_valign_baseline-expected.txt
index ec0efc6..03179c3 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tr_valign_baseline-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tr_valign_baseline-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
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 130x14
           text run at (0,0) width 130: "TR VALIGN=BASELINE"
@@ -19,3 +20,21 @@ layer at (0,0) size 800x600
               RenderText {#text} at (2,2) size 202x28
                 text run at (2,2) width 202: "This text should be vertically aligned to the"
                 text run at (2,16) width 38: "baseline"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 176x19
+          text run at (0,0) width 176: "TR VALIGN=BASELINE"
+      RenderTable {TABLE} at (0,19) size 784x218 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 782x216
+          RenderTableRow {TR} at (0,2) size 782x212
+            RenderTableCell {TD} at (2,2) size 304x189 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (2,2) size 300x185
+            RenderTableCell {TD} at (308,172) size 235x42 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 182x38
+                text run at (2,2) width 182: "This text should be vertically"
+                text run at (2,21) width 140: "aligned to the baseline"
+            RenderTableCell {TD} at (545,172) size 235x42 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 182x38
+                text run at (2,2) width 182: "This text should be vertically"
+                text run at (2,21) width 140: "aligned to the baseline"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d