tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / font-initial-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/font-initial-expected.txt b/LayoutTests/platform/efl/fast/text/font-initial-expected.txt
index 659925e..e96b3c1 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/font-initial-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/font-initial-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 40x14
           text run at (0,0) width 40: "Test for "
@@ -19,5 +20,23 @@ layer at (0,0) size 800x600
         RenderInline {SPAN} at (0,0) size 30x14
           RenderText {#text} at (0,0) size 30x14
             text run at (0,0) width 30: "PASS"
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 620x19
+          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=12039"
+          RenderText {#text} at (354,0) size 319x19
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 315: "Assertion failure in WebCore::Font::primaryFont"
+        RenderText {#text} at (673,0) size 4x19
+          text run at (673,0) width 4: "."
+      RenderBlock (anonymous) at (0,35) size 784x19
+        RenderInline {SPAN} at (0,0) size 39x19
+          RenderText {#text} at (0,0) size 39x19
+            text run at (0,0) width 39: "PASS"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0