tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / layout-state-scrolloffset2-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/layout-state-scrolloffset2-expected.txt b/LayoutTests/platform/efl/fast/repaint/layout-state-scrolloffset2-expected.txt
index ca3f56b..355ab81 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/layout-state-scrolloffset2-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/layout-state-scrolloffset2-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x30
   RenderBlock {HTML} at (0,0) size 800x30
     RenderBody {BODY} at (8,8) size 784x14
@@ -17,3 +18,22 @@ layer at (101,115) size 102x102 clip at (102,116) size 100x100
     RenderBlock {DIV} at (1,1) size 50x50
       RenderText {#text} at (0,0) size 21x14
         text run at (0,0) width 21: "after"
+=======
+layer at (0,0) size 800x35
+  RenderBlock {HTML} at (0,0) size 800x35
+    RenderBody {BODY} at (8,8) size 784x19
+      RenderText {#text} at (0,0) size 416x19
+        text run at (0,0) width 416: "You should see the text 'after' in the inner box, no mangled pixels."
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,27) size 302x302 clip at (9,28) size 300x300 scrollX 2 scrollY 2 scrollWidth 302 scrollHeight 302
+  RenderBlock (positioned) {DIV} at (8,27) size 302x302 [border: (1px solid #FFFF00)]
+layer at (7,26) size 302x302 backgroundClip at (9,28) size 300x300 clip at (9,28) size 299x299 outlineClip at (9,28) size 300x300 scrollX 7 scrollY 7 scrollWidth 1000 scrollHeight 1000
+  RenderBlock (positioned) {DIV} at (1,1) size 302x302 [border: (1px solid #FF0000)]
+    RenderBlock {DIV} at (1,1) size 1000x1000
+layer at (101,120) size 102x102 clip at (102,121) size 100x100
+  RenderBlock (positioned) {DIV} at (101,101) size 102x102 [border: (1px solid #008000)]
+    RenderBlock {DIV} at (1,1) size 50x50
+      RenderText {#text} at (0,0) size 28x19
+        text run at (0,0) width 28: "after"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d