tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / compositing / overflow / overflow-compositing-descendant-expected.txt

diff --git a/LayoutTests/platform/efl/compositing/overflow/overflow-compositing-descendant-expected.txt b/LayoutTests/platform/efl/compositing/overflow/overflow-compositing-descendant-expected.txt
index efa7b39..c7ed22f 100755 (executable)
--- a/LayoutTests/platform/efl/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/LayoutTests/platform/efl/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {HTML} at (0,0) size 800x38
     RenderBody {BODY} at (8,12) size 784x14
@@ -15,3 +16,20 @@ layer at (19,49) size 100x100
   RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
 layer at (19,152) size 100x100
   RenderBlock (relative positioned) {DIV} at (11,114) size 100x100 [bgcolor=#008000]
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 467x19
+          text run at (0,0) width 467: "You should see a green box under the video. If you see red, the test failed."
+layer at (8,51) size 132x222 clip at (9,52) size 130x220 scrollHeight 224
+  RenderBlock (positioned) {DIV} at (8,51) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (11,11) size 110x104
+      RenderText {#text} at (0,0) size 0x0
+    RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
+layer at (19,62) size 100x100
+  RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,166) size 100x100
+  RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d