tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / reflections / reflection-overflow-hidden-expected.txt

diff --git a/LayoutTests/platform/efl/fast/reflections/reflection-overflow-hidden-expected.txt b/LayoutTests/platform/efl/fast/reflections/reflection-overflow-hidden-expected.txt
index 336c4e2..ede5247 100755 (executable)
--- a/LayoutTests/platform/efl/fast/reflections/reflection-overflow-hidden-expected.txt
+++ b/LayoutTests/platform/efl/fast/reflections/reflection-overflow-hidden-expected.txt
@@ -1,10 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x114 layerType: background only
+=======
+layer at (0,0) size 800x138 layerType: background only
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (50,100) size 400x50
   RenderBlock (positioned) zI: -1 {DIV} at (50,100) size 400x50 [bgcolor=#FF0000]
 layer at (50,250) size 400x50
   RenderBlock (positioned) zI: -1 {DIV} at (50,250) size 400x50 [bgcolor=#FF0000]
+<<<<<<< HEAD
 layer at (0,0) size 800x114 layerType: foreground only
   RenderBlock {HTML} at (0,0) size 800x114
     RenderBody {BODY} at (50,50) size 700x14
@@ -15,15 +20,37 @@ layer at (0,0) size 800x114 layerType: foreground only
         RenderText {#text} at (230,0) size 437x14
           text run at (230,0) width 46: ". Test for "
           text run at (276,0) width 391: "reflection painting on overflow:hidden element. You should not see any red below."
+=======
+layer at (0,0) size 800x138 layerType: foreground only
+  RenderBlock {HTML} at (0,0) size 800x138
+    RenderBody {BODY} at (50,50) size 700x38
+      RenderBlock {P} at (0,0) size 700x38
+        RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 305x19
+            text run at (0,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=22570"
+        RenderText {#text} at (305,0) size 697x38
+          text run at (305,0) width 61: ". Test for "
+          text run at (366,0) width 331: "reflection painting on overflow:hidden element. You"
+          text run at (0,19) width 188: "should not see any red below."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (50,100) size 400x200
   RenderBlock (positioned) {DIV} at (50,100) size 400x200
 layer at (50,100) size 400x200
   RenderBlock (relative positioned) {DIV} at (0,0) size 400x200
 layer at (50,100) size 400x50
   RenderBlock (positioned) {DIV} at (0,0) size 400x50 [bgcolor=#008000]
+<<<<<<< HEAD
     RenderText {#text} at (0,0) size 19x14
       text run at (0,0) width 19: "Top"
 layer at (50,250) size 400x50
   RenderBlock (positioned) {DIV} at (0,150) size 400x50 [bgcolor=#008000]
     RenderText {#text} at (0,0) size 35x14
       text run at (0,0) width 35: "Bottom"
+=======
+    RenderText {#text} at (0,0) size 26x19
+      text run at (0,0) width 26: "Top"
+layer at (50,250) size 400x50
+  RenderBlock (positioned) {DIV} at (0,150) size 400x50 [bgcolor=#008000]
+    RenderText {#text} at (0,0) size 47x19
+      text run at (0,0) width 47: "Bottom"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d