tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / box-shadow-dynamic-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt b/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
index c6515ef..9498ca5 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x286
   RenderBlock {HTML} at (0,0) size 800x286
     RenderBody {BODY} at (8,12) size 784x266
@@ -10,5 +11,17 @@ layer at (0,0) size 800x286
         RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
           RenderBlock {DIV} at (10,0) size 30x50
       RenderBlock {DIV} at (0,146) size 70x120
+=======
+layer at (0,0) size 800x299
+  RenderBlock {HTML} at (0,0) size 800x299
+    RenderBody {BODY} at (8,16) size 784x275
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 382x19
+          text run at (0,0) width 382: "Tests the repainting of box shadows when boxes are resized."
+      RenderBlock {DIV} at (0,35) size 70x120
+        RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
+          RenderBlock {DIV} at (10,0) size 30x50
+      RenderBlock {DIV} at (0,155) size 70x120
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
           RenderBlock {DIV} at (10,0) size 30x50