tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / fast-mobile-scrolling / fixed-position-element-expected.txt

diff --git a/LayoutTests/platform/efl/fast/fast-mobile-scrolling/fixed-position-element-expected.txt b/LayoutTests/platform/efl/fast/fast-mobile-scrolling/fixed-position-element-expected.txt
index 35758cb..f223fc3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/fast-mobile-scrolling/fixed-position-element-expected.txt
+++ b/LayoutTests/platform/efl/fast/fast-mobile-scrolling/fixed-position-element-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 739x14
           text run at (0,0) width 739: "This tests that fixed background images are honored on a page with at least one fixed position element. If the square (below) is green, then the test PASSED."
@@ -13,3 +14,16 @@ layer at (8,100) size 64x64
   RenderBlock (positioned) {DIV} at (8,100) size 64x64
     RenderText {#text} at (0,0) size 3x14
       text run at (0,0) width 3: " "
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 781x38
+          text run at (0,0) width 781: "This tests that fixed background images are honored on a page with at least one fixed position element. If the square (below)"
+          text run at (0,19) width 201: "is green, then the test PASSED."
+      RenderBlock {DIV} at (0,86) size 64x64 [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 4x19
+          text run at (0,0) width 4: " "
+layer at (8,100) size 64x64
+  RenderBlock (positioned) {DIV} at (8,100) size 64x64
+    RenderText {#text} at (0,0) size 4x19
+      text run at (0,0) width 4: " "
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d