Changeset 243845 in webkit

Timestamp:

Apr 3, 2019 7:09:50 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r220717): Assertion fires when animating an SVG rounded corner rect till it collapses
​https://bugs.webkit.org/show_bug.cgi?id=196518

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-04-03
Reviewed by Simon Fraser.

Source/WebCore:

r220717 made RenderSVGRect clear its m_path in updateShapeFromElement().

RenderSVGRect tries to optimize its layout and drawing if the rectangle
is not rounded. So it uses the flag m_usePathFallback to know whether to
use m_path or m_innerStrokeRect and m_outerStrokeRect. If the rectangle
is rounded but its boundingSize is empty, m_path will be cleared,
m_innerStrokeRect and m_outerStrokeRect will be recalculated but
m_usePathFallback will not be reset to false. Therefore when calling
RenderSVGRect::isEmpty(), it will call RenderSVGShape::isEmpty() which
will assert since m_path is null.

Test: svg/animations/animate-rounded-corner-rect-zero-height.svg

• rendering/svg/RenderSVGRect.cpp:

(WebCore::RenderSVGRect::updateShapeFromElement):
Reset m_usePathFallback to false once clearPath() is called.

LayoutTests:

• svg/animations/animate-rounded-corner-rect-zero-height-expected.txt: Added.
• svg/animations/animate-rounded-corner-rect-zero-height.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-rounded-corner-rect-zero-height-expected.txt (added)
• LayoutTests/svg/animations/animate-rounded-corner-rect-zero-height.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGRect.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-03  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        REGRESSION (r220717): Assertion fires when animating an SVG rounded corner rect till it collapses
+        https://bugs.webkit.org/show_bug.cgi?id=196518
+
+        Reviewed by Simon Fraser.
+
+        * svg/animations/animate-rounded-corner-rect-zero-height-expected.txt: Added.
+        * svg/animations/animate-rounded-corner-rect-zero-height.svg: Added.
+
 2019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-03  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        REGRESSION (r220717): Assertion fires when animating an SVG rounded corner rect till it collapses
+        https://bugs.webkit.org/show_bug.cgi?id=196518
+
+        Reviewed by Simon Fraser.
+
+        r220717 made RenderSVGRect clear its m_path in updateShapeFromElement().
+
+        RenderSVGRect tries to optimize its layout and drawing if the rectangle
+        is not rounded. So it uses the flag m_usePathFallback to know whether to
+        use m_path or m_innerStrokeRect and m_outerStrokeRect. If the rectangle
+        is rounded but its boundingSize is empty, m_path will be cleared,
+        m_innerStrokeRect and m_outerStrokeRect will be recalculated but
+        m_usePathFallback will not be reset to false. Therefore when calling 
+        RenderSVGRect::isEmpty(), it will call RenderSVGShape::isEmpty() which
+        will assert since m_path is null.
+
+        Test: svg/animations/animate-rounded-corner-rect-zero-height.svg
+
+        * rendering/svg/RenderSVGRect.cpp:
+        (WebCore::RenderSVGRect::updateShapeFromElement):
+        Reset m_usePathFallback to false once clearPath() is called.
+
 2019-04-03  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -56 +56 @@
     m_outerStrokeRect = FloatRect();
     clearPath();
+    m_usePathFallback = false;
 
     SVGLengthContext lengthContext(&rectElement());
@@ -72 +73 @@
             return;
         }
-        m_usePathFallback = false;
     }