tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / clip / 011-expected.txt

diff --git a/LayoutTests/platform/efl/fast/clip/011-expected.txt b/LayoutTests/platform/efl/fast/clip/011-expected.txt
index abb97c4..9c1dafd 100755 (executable)
--- a/LayoutTests/platform/efl/fast/clip/011-expected.txt
+++ b/LayoutTests/platform/efl/fast/clip/011-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
@@ -10,4 +11,17 @@ layer at (0,0) size 800x30
       RenderText {#text} at (0,0) size 0x0
 layer at (8,22) size 100x100
   RenderBlock (positioned) {DIV} at (8,22) size 100x100 [bgcolor=#008000]
+=======
+layer at (0,0) size 800x54
+  RenderBlock {HTML} at (0,0) size 800x54
+    RenderBody {BODY} at (8,8) size 784x38
+      RenderText {#text} at (0,0) size 780x38
+        text run at (0,0) width 304: "You should see a 100x100 green square below. "
+        text run at (304,0) width 237: "If you see any red, the test has failed. "
+        text run at (541,0) width 239: "This test is checking to make sure clip"
+        text run at (0,19) width 188: "is applying to all descendants."
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,46) size 100x100
+  RenderBlock (positioned) {DIV} at (8,46) size 100x100 [bgcolor=#008000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#FF0000]