Changeset 112438 in webkit

Timestamp:

Mar 28, 2012 2:00:37 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Incorrect foreignObject hit test results when overlapping other SVG elements
​https://bugs.webkit.org/show_bug.cgi?id=82059

Patch by Florin Malita <​fmalita@google.com> on 2012-03-28
Reviewed by Nikolas Zimmermann.

Source/WebCore:

Test: svg/hittest/foreign-object-background.svg

Foreign content needs to be hit-tested atomically due to the (pseudo)
stacking context established by FOs.

• rendering/svg/RenderSVGForeignObject.cpp:

(WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
Hit test all phases on FO HitTestForeground.

LayoutTests:

• svg/hittest/foreign-object-background-expected.txt: Added.
• svg/hittest/foreign-object-background.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/hittest/foreign-object-background-expected.txt (added)
• LayoutTests/svg/hittest/foreign-object-background.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-28  Florin Malita  <fmalita@google.com>
+
+        Incorrect foreignObject hit test results when overlapping other SVG elements
+        https://bugs.webkit.org/show_bug.cgi?id=82059
+
+        Reviewed by Nikolas Zimmermann.
+
+        * svg/hittest/foreign-object-background-expected.txt: Added.
+        * svg/hittest/foreign-object-background.svg: Added.
+
 2012-03-26  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-28  Florin Malita  <fmalita@google.com>
+
+        Incorrect foreignObject hit test results when overlapping other SVG elements
+        https://bugs.webkit.org/show_bug.cgi?id=82059
+
+        Reviewed by Nikolas Zimmermann.
+
+        Test: svg/hittest/foreign-object-background.svg
+
+        Foreign content needs to be hit-tested atomically due to the (pseudo)
+        stacking context established by FOs.
+
+        * rendering/svg/RenderSVGForeignObject.cpp:
+        (WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
+        Hit test all phases on FO HitTestForeground.
+
 2012-03-26  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp

@@ -27 +27 @@
 #include "GraphicsContext.h"
 #include "LayoutRepainter.h"
+#include "RenderObject.h"
 #include "RenderSVGResource.h"
 #include "RenderView.h"
@@ -166 +167 @@
 bool RenderSVGForeignObject::nodeAtFloatPoint(const HitTestRequest& request, HitTestResult& result, const FloatPoint& pointInParent, HitTestAction hitTestAction)
 {
+    // Embedded content is drawn in the foreground phase.
+    if (hitTestAction != HitTestForeground)
+        return false;
+
     FloatPoint localPoint = localTransform().inverse().mapPoint(pointInParent);
 
@@ -172 +177 @@
         return false;
 
-    return RenderBlock::nodeAtPoint(request, result, roundedLayoutPoint(localPoint), LayoutPoint(), hitTestAction);
+    // FOs establish a stacking context, so we need to hit-test all layers.
+    return RenderBlock::nodeAtPoint(request, result, roundedLayoutPoint(localPoint), LayoutPoint(), HitTestForeground)
+        || RenderBlock::nodeAtPoint(request, result, roundedLayoutPoint(localPoint), LayoutPoint(), HitTestFloat)
+        || RenderBlock::nodeAtPoint(request, result, roundedLayoutPoint(localPoint), LayoutPoint(), HitTestChildBlockBackgrounds);
 }