tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / compositing / geometry / video-opacity-overlay-expected.txt

diff --git a/LayoutTests/platform/efl/compositing/geometry/video-opacity-overlay-expected.txt b/LayoutTests/platform/efl/compositing/geometry/video-opacity-overlay-expected.txt
index 093a605..c229d5b 100755 (executable)
--- a/LayoutTests/platform/efl/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/LayoutTests/platform/efl/compositing/geometry/video-opacity-overlay-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x348
   RenderBlock {HTML} at (0,0) size 800x348
     RenderBody {BODY} at (8,12) size 784x328
@@ -15,4 +16,21 @@ layer at (9,39) size 400x300
 layer at (9,342) size 10x10
   RenderBlock {DIV} at (1,304) size 10x10 [bgcolor=#008000]
 layer at (9,279) size 400x60
+=======
+layer at (0,0) size 800x361
+  RenderBlock {HTML} at (0,0) size 800x361
+    RenderBody {BODY} at (8,16) size 784x337
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 294x19
+          text run at (0,0) width 294: "The orange bar should be in front of the video."
+layer at (8,51) size 402x302
+  RenderBlock (relative positioned) {DIV} at (0,35) size 402x302 [border: (1px solid #000000)]
+    RenderBlock (anonymous) at (1,1) size 400x304
+      RenderText {#text} at (0,0) size 0x0
+layer at (9,52) size 400x300
+  RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,356) size 10x10
+  RenderBlock {DIV} at (1,305) size 10x10 [bgcolor=#008000]
+layer at (9,292) size 400x60
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (1,241) size 400x60 [bgcolor=#FFA500]