tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / parser / fonts-expected.txt

diff --git a/LayoutTests/platform/efl/fast/parser/fonts-expected.txt b/LayoutTests/platform/efl/fast/parser/fonts-expected.txt
index 42e1702..3655c5e 100755 (executable)
--- a/LayoutTests/platform/efl/fast/parser/fonts-expected.txt
+++ b/LayoutTests/platform/efl/fast/parser/fonts-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x405
   RenderBlock {HTML} at (0,0) size 800x405
     RenderBody {BODY} at (8,8) size 784x385
@@ -80,4 +81,86 @@ layer at (0,0) size 800x405
         RenderInline {SPAN} at (0,0) size 72x13 [color=#FFFFFF] [bgcolor=#FF0000]
           RenderText {#text} at (0,0) size 72x13
             text run at (0,0) width 72: "FAIL-n"
+=======
+layer at (0,0) size 800x535
+  RenderBlock {HTML} at (0,0) size 800x535
+    RenderBody {BODY} at (8,8) size 784x511
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderInline {DIV} at (0,0) size 528x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,2) size 528x17
+            text run at (0,2) width 528: "Ahem_font_required_for_this_test."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,35) size 752x19 [color=#008000]
+        RenderText {#text} at (0,0) size 360x19
+          text run at (0,0) width 360: "This line should be green. There should be no red below."
+      RenderBlock {P} at (16,70) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-a"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,103) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-b"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,136) size 96x16 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-c"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,168) size 96x16 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-d"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,200) size 96x16 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-e"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,232) size 96x16 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-f"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,264) size 96x16 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-g"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,296) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-h"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,329) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-i"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,362) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-j"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,395) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-k"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,428) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-l"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,461) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-m"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (16,494) size 96x17 [color=#008000]
+        RenderInline {SPAN} at (0,0) size 96x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,0) size 96x17
+            text run at (0,0) width 96: "FAIL-n"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0