tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / first-letter-float-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/first-letter-float-expected.txt b/LayoutTests/platform/efl/fast/css/first-letter-float-expected.txt
index f19b017..1098fb3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/first-letter-float-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/first-letter-float-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 40x14
@@ -50,3 +51,54 @@ layer at (0,0) size 800x600
             text run at (0,0) width 9: "A"
         RenderText {#text} at (9,0) size 11x14
           text run at (9,0) width 11: "-Z"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 776x38
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (53,0) size 301x19
+              text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=17834"
+          RenderText {#text} at (354,0) size 776x38
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 418: "REGRESSION: floated first-letter does not work when included in"
+            text run at (0,19) width 31: "table"
+        RenderText {#text} at (31,19) size 4x19
+          text run at (31,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 274x19
+          text run at (0,0) width 274: "The following three lines should look like \x{201C}"
+        RenderInline {SPAN} at (0,0) size 12x19 [color=#008000]
+          RenderText {#text} at (274,0) size 12x19
+            text run at (274,0) width 12: "A"
+        RenderText {#text} at (286,0) size 26x19
+          text run at (286,0) width 26: "-Z\x{201D}."
+      RenderTable {TABLE} at (0,89) size 33x25
+        RenderTableSection {TBODY} at (0,0) size 33x25
+          RenderTableRow {TR} at (0,2) size 33x21
+            RenderTableCell {TD} at (2,2) size 29x21 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 27x19
+                RenderBlock {P} at (0,0) size 27x19
+                  RenderBlock (floating) at (0,0) size 12x19 [color=#008000]
+                    RenderText {#text} at (0,0) size 12x19
+                      text run at (0,0) width 12: "A"
+                  RenderText {#text} at (12,0) size 15x19
+                    text run at (12,0) width 15: "-Z"
+      RenderTable {TABLE} at (0,114) size 33x25
+        RenderTableSection {TBODY} at (0,0) size 33x25
+          RenderTableRow {TR} at (0,2) size 33x21
+            RenderTableCell {TD} at (2,2) size 29x21 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {P} at (1,1) size 27x19
+                RenderBlock (floating) at (0,0) size 12x19 [color=#008000]
+                  RenderText {#text} at (0,0) size 12x19
+                    text run at (0,0) width 12: "A"
+                RenderText {#text} at (12,0) size 15x19
+                  text run at (12,0) width 15: "-Z"
+      RenderBlock {P} at (0,155) size 784x19
+        RenderBlock (floating) at (0,0) size 12x19 [color=#008000]
+          RenderText {#text} at (0,0) size 12x19
+            text run at (0,0) width 12: "A"
+        RenderText {#text} at (12,0) size 15x19
+          text run at (12,0) width 15: "-Z"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d