tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / static-to-positioned-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/static-to-positioned-expected.txt b/LayoutTests/platform/efl/fast/repaint/static-to-positioned-expected.txt
index 1027075..7c5287b 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/static-to-positioned-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/static-to-positioned-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x454
   RenderBlock {HTML} at (0,0) size 800x454
     RenderBody {BODY} at (8,12) size 784x434
@@ -24,4 +25,31 @@ layer at (8,246) size 784x200
   RenderBlock (relative positioned) {DIV} at (0,234) size 784x200
     RenderBlock {DIV} at (0,50) size 784x150
 layer at (8,246) size 100x100
+=======
+layer at (0,0) size 800x488
+  RenderBlock {HTML} at (0,0) size 800x488
+    RenderBody {BODY} at (8,16) size 784x464
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 100x19
+          text run at (0,0) width 100: "Repaint test for "
+        RenderInline {I} at (0,0) size 777x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (100,0) size 348x19
+              text run at (100,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=9334"
+          RenderText {#text} at (448,0) size 777x38
+            text run at (448,0) width 4: " "
+            text run at (452,0) width 325: "Incomplete repaint when changing block from non-"
+            text run at (0,19) width 150: "positioned to positioned"
+        RenderText {#text} at (150,19) size 4x19
+          text run at (150,19) width 4: "."
+      RenderBlock {HR} at (0,54) size 784x2 [border: (1px inset #000000)]
+layer at (8,80) size 784x200
+  RenderBlock (relative positioned) {DIV} at (0,64) size 784x200
+layer at (8,130) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#0000FF]
+layer at (8,280) size 784x200
+  RenderBlock (relative positioned) {DIV} at (0,264) size 784x200
+    RenderBlock {DIV} at (0,50) size 784x150
+layer at (8,280) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#0000FF]