tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_caption_align_bot-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_caption_align_bot-expected.txt
index 01fe61f..afd438f 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_caption_align_bot-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_caption_align_bot-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 223x14
           text run at (0,0) width 223: "The caption should be at the bottom of the table"
@@ -31,3 +32,33 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (84,22) size 42x18 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
               RenderText {#text} at (2,2) size 31x14
                 text run at (2,2) width 31: "Ocelot"
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 300x19
+          text run at (0,0) width 300: "The caption should be at the bottom of the table"
+      RenderTable {TABLE} at (0,35) size 168x73 [border: (1px outset #808080)]
+        RenderBlock {CAPTION} at (0,54) size 166x19
+          RenderText {#text} at (51,0) size 64x19
+            text run at (51,0) width 64: "Wild Cats"
+        RenderTableSection {TBODY} at (1,1) size 166x52
+          RenderTableRow {TR} at (0,2) size 166x23
+            RenderTableCell {TD} at (2,2) size 45x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 30x19
+                text run at (2,2) width 30: "Lion"
+            RenderTableCell {TD} at (49,2) size 57x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 53x19
+                text run at (2,2) width 53: "Leopard"
+            RenderTableCell {TD} at (108,2) size 56x23 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 52x19
+                text run at (2,2) width 52: "Cheetah"
+          RenderTableRow {TR} at (0,27) size 166x23
+            RenderTableCell {TD} at (2,27) size 45x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 41x19
+                text run at (2,2) width 41: "Jaguar"
+            RenderTableCell {TD} at (49,27) size 57x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 45x19
+                text run at (2,2) width 45: "Bobcat"
+            RenderTableCell {TD} at (108,27) size 56x23 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 42x19
+                text run at (2,2) width 42: "Ocelot"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d