Changeset 94116 in webkit

Timestamp:

Aug 30, 2011 3:12:02 PM (13 years ago)

Author:

timothy_horton@apple.com

Message:

getBBox() on a SVGPathElement with curves incorrectly includes control points
​https://bugs.webkit.org/show_bug.cgi?id=53512
<rdar://problem/9861154>

Reviewed by Dirk Schulze.

The CoreGraphics implementation of Path::boundingRect() called
CGPathGetBoundingBox, which includes the path's control points in its
calculations. Snow Leopard added CGPathGetPathBoundingBox, which
finds the bounding box of only points within the path, and does not
include control points. On Snow Leopard and above, we now use the latter.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/svg/custom/getBBox-path-expected.txt (added)
• LayoutTests/svg/custom/getBBox-path.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/PathCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        getBBox() on a SVGPathElement with curves incorrectly includes control points
+        https://bugs.webkit.org/show_bug.cgi?id=53512
+        <rdar://problem/9861154>
+
+        Reviewed by Dirk Schulze.
+
+        Add a test ensuring that getBBox returns only the bounds of the filled shape,
+        not the bounds of all of the control points.
+
+        * platform/chromium/test_expectations.txt:
+        * svg/custom/getBBox-path-expected.txt: Added.
+        * svg/custom/getBBox-path.svg: Added.
+
 2011-08-30  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3588 +3588 @@
 BUGWK65874 : fast/js/preventExtensions.html = TEXT
 
+// Introduced due to BUGWK53512, fails under Skia right now
+BUGWK65939 : svg/custom/getBBox-path.svg = TEXT
+
 // Caused by r92704
 BUGWK65951 WIN DEBUG : webaudio/audiobuffersource.html = CRASH

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Tim Horton  <timothy_horton@apple.com>
+
+        getBBox() on a SVGPathElement with curves incorrectly includes control points
+        https://bugs.webkit.org/show_bug.cgi?id=53512
+        <rdar://problem/9861154>
+
+        Reviewed by Dirk Schulze.
+
+        The CoreGraphics implementation of Path::boundingRect() called
+        CGPathGetBoundingBox, which includes the path's control points in its
+        calculations. Snow Leopard added CGPathGetPathBoundingBox, which
+        finds the bounding box of only points within the path, and does not
+        include control points. On Snow Leopard and above, we now use the latter.
+
+        Test: svg/custom/getBBox-path.svg
+
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::Path::boundingRect):
+
 2011-08-30  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

@@ -164 +164 @@
 FloatRect Path::boundingRect() const
 {
+    // CGPathGetBoundingBox includes the path's control points, CGPathGetPathBoundingBox
+    // does not, but only exists on 10.6 and above.
+#if !defined(BUILDING_ON_LEOPARD)
+    return CGPathGetPathBoundingBox(m_path);
+#else
     return CGPathGetBoundingBox(m_path);
+#endif
 }