Changeset 106882 in webkit

Timestamp:

Feb 6, 2012 5:30:50 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

RenderSVGShape::strokeContains will fail for some strokes
​https://bugs.webkit.org/show_bug.cgi?id=76931

Patch by Stephen Chenney <​schenney@chromium.org> on 2012-02-06
Reviewed by Darin Adler.

Source/WebCore:

Adding support for rounded zero-length endcaps for SVG path hit
testing.

Tests: svg/hittest/zero-length-butt-cap-path.xhtml

svg/hittest/zero-length-round-cap-path.xhtml
svg/hittest/zero-length-square-cap-path.xhtml

• rendering/svg/RenderSVGShape.cpp:

(WebCore::RenderSVGShape::strokeContains):

LayoutTests:

New tests for hit testing against an SVG path of zero length with
endcaps.

• svg/hittest/zero-length-butt-cap-path-expected.txt: Added.
• svg/hittest/zero-length-butt-cap-path.xhtml: Added.
• svg/hittest/zero-length-round-cap-path-expected.txt: Added.
• svg/hittest/zero-length-round-cap-path.xhtml: Added.
• svg/hittest/zero-length-square-cap-path-expected.txt: Added.
• svg/hittest/zero-length-square-cap-path.xhtml: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/hittest/zero-length-butt-cap-path-expected.txt (added)
• LayoutTests/svg/hittest/zero-length-butt-cap-path.xhtml (added)
• LayoutTests/svg/hittest/zero-length-round-cap-path-expected.txt (added)
• LayoutTests/svg/hittest/zero-length-round-cap-path.xhtml (added)
• LayoutTests/svg/hittest/zero-length-square-cap-path-expected.txt (added)
• LayoutTests/svg/hittest/zero-length-square-cap-path.xhtml (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGShape.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  Stephen Chenney  <schenney@chromium.org>
+
+        RenderSVGShape::strokeContains will fail for some strokes
+        https://bugs.webkit.org/show_bug.cgi?id=76931
+
+        Reviewed by Darin Adler.
+
+        New tests for hit testing against an SVG path of zero length with
+        endcaps.
+
+        * svg/hittest/zero-length-butt-cap-path-expected.txt: Added.
+        * svg/hittest/zero-length-butt-cap-path.xhtml: Added.
+        * svg/hittest/zero-length-round-cap-path-expected.txt: Added.
+        * svg/hittest/zero-length-round-cap-path.xhtml: Added.
+        * svg/hittest/zero-length-square-cap-path-expected.txt: Added.
+        * svg/hittest/zero-length-square-cap-path.xhtml: Added.
+
 2012-02-06  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Stephen Chenney  <schenney@chromium.org>
+
+        RenderSVGShape::strokeContains will fail for some strokes
+        https://bugs.webkit.org/show_bug.cgi?id=76931
+
+        Reviewed by Darin Adler.
+
+        Adding support for rounded zero-length endcaps for SVG path hit
+        testing.
+
+        Tests: svg/hittest/zero-length-butt-cap-path.xhtml
+               svg/hittest/zero-length-round-cap-path.xhtml
+               svg/hittest/zero-length-square-cap-path.xhtml
+
+        * rendering/svg/RenderSVGShape.cpp:
+        (WebCore::RenderSVGShape::strokeContains):
+
 2012-02-06  Gregg Tavares  <gman@google.com>
 

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

@@ -137 +137 @@
         return false;
 
-    // FIXME: This is not correct for round linecaps. https://bugs.webkit.org/show_bug.cgi?id=76931
+    const SVGRenderStyle* svgStyle = style()->svgStyle();
     for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i) {
-        if (zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], this->strokeWidth()).contains(point))
-            return true;
-    }
-
-    const SVGRenderStyle* svgStyle = style()->svgStyle();
+        ASSERT(style()->svgStyle()->hasStroke());
+        float strokeWidth = this->strokeWidth();
+        if (style()->svgStyle()->capStyle() == SquareCap) {
+            if (zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth).contains(point))
+                return true;
+        } else {
+            ASSERT(style()->svgStyle()->capStyle() == RoundCap);
+            FloatPoint radiusVector(point.x() - m_zeroLengthLinecapLocations[i].x(), point.y() -  m_zeroLengthLinecapLocations[i].y());
+            if (radiusVector.lengthSquared() < strokeWidth * strokeWidth * .25f)
+                return true;
+        }
+    }
+
     if (!svgStyle->strokeDashArray().isEmpty() || svgStyle->strokeMiterLimit() != svgStyle->initialStrokeMiterLimit()
         || svgStyle->joinStyle() != svgStyle->initialJoinStyle() || svgStyle->capStyle() != svgStyle->initialCapStyle() || static_cast<SVGElement*>(node())->isStyled()) {