tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / transforms / no_transform_hit_testing-expected.txt

diff --git a/LayoutTests/platform/efl/transforms/no_transform_hit_testing-expected.txt b/LayoutTests/platform/efl/transforms/no_transform_hit_testing-expected.txt
index 4b9cf58..535cc40 100755 (executable)
--- a/LayoutTests/platform/efl/transforms/no_transform_hit_testing-expected.txt
+++ b/LayoutTests/platform/efl/transforms/no_transform_hit_testing-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {H1} at (0,0) size 784x28
         RenderText {#text} at (0,1) size 461x26
@@ -17,3 +18,20 @@ layer at (8,212) size 21x14
   RenderBlock (positioned) {P} at (8,212) size 21x14
     RenderText {#text} at (0,0) size 21x14
       text run at (0,0) width 21: "pass"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {H1} at (0,0) size 784x37
+        RenderText {#text} at (0,0) size 616x36
+          text run at (0,0) width 616: "Testing hittest on a layer with null transform"
+      RenderBlock {P} at (0,58) size 784x19
+        RenderText {#text} at (0,0) size 305x19
+          text run at (0,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=24252"
+layer at (20,96) size 400x100
+  RenderBlock (positioned) {P} at (20,96) size 400x100 [bgcolor=#DDDDFF]
+    RenderText {#text} at (0,0) size 128x19
+      text run at (0,0) width 128: "transformed element"
+layer at (8,216) size 27x19
+  RenderBlock (positioned) {P} at (8,216) size 27x19
+    RenderText {#text} at (0,0) size 27x19
+      text run at (0,0) width 27: "pass"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d