tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / inline / br-text-decoration-expected.txt

diff --git a/LayoutTests/platform/efl/fast/inline/br-text-decoration-expected.txt b/LayoutTests/platform/efl/fast/inline/br-text-decoration-expected.txt
index 0bcb549..e0b71c6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/inline/br-text-decoration-expected.txt
+++ b/LayoutTests/platform/efl/fast/inline/br-text-decoration-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x78
   RenderBlock {HTML} at (0,0) size 800x78
     RenderBody {BODY} at (8,12) size 784x54
@@ -22,3 +23,27 @@ layer at (0,0) size 800x78
             text run at (269,0) width 260: "Underline painted under <br>, not repainted properly"
         RenderText {#text} at (529,0) size 3x14
           text run at (529,0) width 3: "."
+=======
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (8,16) size 784x73
+      RenderBlock {P} at (0,0) size 784x38
+        RenderInline {SPAN} at (0,0) size 465x38
+          RenderBR {BR} at (0,0) size 0x19
+          RenderText {#text} at (0,19) size 465x19
+            text run at (0,19) width 465: "There shouldn\x{2019}t be a black dot or line above the first letter of this sentence"
+        RenderText {#text} at (465,19) size 4x19
+          text run at (465,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 651x19
+          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=14245"
+          RenderText {#text} at (354,0) size 350x19
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 346: "Underline painted under <br>, not repainted properly"
+        RenderText {#text} at (704,0) size 4x19
+          text run at (704,0) width 4: "."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d