Changeset 249203 in webkit

Timestamp:

Aug 28, 2019, 9:57:31 AM (7 years ago)

Author:

Simon Fraser

Message:

Have RenderSVGBlock compute visual overflow just like everyone else
​https://bugs.webkit.org/show_bug.cgi?id=201211

Reviewed by Zalan Bujtas.

RenderSVGBlock overrode visualOverflowRect() just to account for text shadow. This prevents callers
optimizing calls to visualOverflowRect(), so instead have RenderSVGBlock implement computeOverflow()
and call addVisualOverflow().

• rendering/svg/RenderSVGBlock.cpp:

(WebCore::RenderSVGBlock::computeOverflow):
(WebCore::RenderSVGBlock::visualOverflowRect const): Deleted.

• rendering/svg/RenderSVGBlock.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGBlock.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGBlock.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Have RenderSVGBlock compute visual overflow just like everyone else
+        https://bugs.webkit.org/show_bug.cgi?id=201211
+
+        Reviewed by Zalan Bujtas.
+
+        RenderSVGBlock overrode visualOverflowRect() just to account for text shadow. This prevents callers
+        optimizing calls to visualOverflowRect(), so instead have RenderSVGBlock implement computeOverflow()
+        and call addVisualOverflow().
+
+        * rendering/svg/RenderSVGBlock.cpp:
+        (WebCore::RenderSVGBlock::computeOverflow):
+        (WebCore::RenderSVGBlock::visualOverflowRect const): Deleted.
+        * rendering/svg/RenderSVGBlock.h:
+
 2019-08-28  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -35 +35 @@
     : RenderBlockFlow(element, WTFMove(style))
 {
-}
-
-LayoutRect RenderSVGBlock::visualOverflowRect() const
-{
-    LayoutRect borderRect = borderBoxRect();
-
-    if (const ShadowData* textShadow = style().textShadow())
-        textShadow->adjustRectForShadow(borderRect);
-
-    return borderRect;
 }
 
@@ -86 +76 @@
 }
 
+void RenderSVGBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats)
+{
+    RenderBlockFlow::computeOverflow(oldClientAfterEdge, recomputeFloats);
+
+    const auto* textShadow = style().textShadow();
+    if (!textShadow)
+        return;
+
+    LayoutRect borderRect = borderBoxRect();
+    textShadow->adjustRectForShadow(borderRect);
+    addVisualOverflow(snappedIntRect(borderRect));
 }
+
+}

trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h

@@ -30 +30 @@
     WTF_MAKE_ISO_ALLOCATED(RenderSVGBlock);
 public:
-    LayoutRect visualOverflowRect() const final;
-
     SVGGraphicsElement& graphicsElement() const { return downcast<SVGGraphicsElement>(nodeForNonAnonymous()); }
 
@@ -37 +35 @@
     RenderSVGBlock(SVGGraphicsElement&, RenderStyle&&);
     void willBeDestroyed() override;
+
+    void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) override;
 
 private: