tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / list-marker-2-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/list-marker-2-expected.txt b/LayoutTests/platform/efl/fast/repaint/list-marker-2-expected.txt
index d489339..04dc729 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/list-marker-2-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/list-marker-2-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 79x14
@@ -21,4 +22,26 @@ layer at (0,0) size 800x600
       RenderBlock {UL} at (0,52) size 784x103
         RenderListItem {LI} at (40,0) size 744x103
           RenderListMarker at (-15,89) size 6x14: bullet
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 104x19
+          text run at (0,0) width 104: "This is a test for "
+        RenderInline {I} at (0,0) size 761x38
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (104,0) size 301x19
+              text run at (104,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=13209"
+          RenderText {#text} at (405,0) size 761x38
+            text run at (405,0) width 4: " "
+            text run at (409,0) width 352: "REGRESSION (r18756-18765): Incomplete list marker"
+            text run at (0,19) width 189: "repaint when resizing list item"
+        RenderText {#text} at (189,19) size 4x19
+          text run at (189,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 419x19
+          text run at (0,0) width 419: "There should be only one bullet, at the bottom left of the rectangle."
+      RenderBlock {UL} at (0,89) size 784x104
+        RenderListItem {LI} at (40,0) size 744x104
+          RenderListMarker at (-18,85) size 7x19: bullet
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderImage {IMG} at (0,0) size 100x100