Changeset 249222 in webkit

Timestamp:

Aug 28, 2019, 3:32:01 PM (7 years ago)

Author:

Simon Fraser

Message:

Devirtualize RenderBox::visualOverflowRect()
​https://bugs.webkit.org/show_bug.cgi?id=201231

Reviewed by Zalan Bujtas.

The only override of RenderBox::visualOverflowRect() was in RenderView, for "paintsEntireContents" views, and as
far as I can tell this is not necessary. visualOverflowRect() is hot when called from RenderLayer::localBoundingBox() --
this shows in profiles when scrolling large patch reviews, so making it non-virtual is a performance enhancement.

RenderLayer::localBoundingBox() can also just call visualOverflowRect(), since that returns borderBoxRect()
when there is no overflow.

• rendering/RenderBox.h:

(WebCore::RenderBox::visualOverflowRect const):

• rendering/RenderLayer.cpp:

(WebCore::performOverlapTests): Minor optimization to avoid a call to boundingBox().
(WebCore::RenderLayer::calculateClipRects const):

• rendering/RenderView.cpp:

(WebCore::RenderView::visualOverflowRect const): Deleted.

• rendering/RenderView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Devirtualize RenderBox::visualOverflowRect()
+        https://bugs.webkit.org/show_bug.cgi?id=201231
+
+        Reviewed by Zalan Bujtas.
+
+        The only override of RenderBox::visualOverflowRect() was in RenderView, for "paintsEntireContents" views, and as
+        far as I can tell this is not necessary. visualOverflowRect() is hot when called from RenderLayer::localBoundingBox() --
+        this shows in profiles when scrolling large patch reviews, so making it non-virtual is a performance enhancement.
+        
+        RenderLayer::localBoundingBox() can also just call visualOverflowRect(), since that returns borderBoxRect()
+        when there is no overflow.
+
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::visualOverflowRect const):
+        * rendering/RenderLayer.cpp:
+        (WebCore::performOverlapTests): Minor optimization to avoid a call to boundingBox().
+        (WebCore::RenderLayer::calculateClipRects const):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::visualOverflowRect const): Deleted.
+        * rendering/RenderView.h:
+
 2019-08-28  Austin Eng  <enga@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -192 +192 @@
     LayoutUnit logicalRightLayoutOverflow() const { return style().isHorizontalWritingMode() ? layoutOverflowRect().maxX() : layoutOverflowRect().maxY(); }
     
-    virtual LayoutRect visualOverflowRect() const { return m_overflow ? m_overflow->visualOverflowRect() : borderBoxRect(); }
+    LayoutRect visualOverflowRect() const { return m_overflow ? m_overflow->visualOverflowRect() : borderBoxRect(); }
     LayoutUnit logicalLeftVisualOverflow() const { return style().isHorizontalWritingMode() ? visualOverflowRect().x() : visualOverflowRect().y(); }
     LayoutUnit logicalRightVisualOverflow() const { return style().isHorizontalWritingMode() ? visualOverflowRect().maxX() : visualOverflowRect().maxY(); }

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4095 +4095 @@
 static void performOverlapTests(OverlapTestRequestMap& overlapTestRequests, const RenderLayer* rootLayer, const RenderLayer* layer)
 {
+    if (overlapTestRequests.isEmpty())
+        return;
+
     Vector<OverlapTestRequestClient*> overlappedRequestClients;
     LayoutRect boundingBox = layer->boundingBox(rootLayer, layer->offsetFromAncestor(rootLayer));
@@ -5935 +5938 @@
             result = box->maskClipRect(LayoutPoint());
             box->flipForWritingMode(result); // The mask clip rect is in physical coordinates, so we have to flip, since localBoundingBox is not.
-        } else {
-            LayoutRect bbox = box->borderBoxRect();
-            result = bbox;
-            LayoutRect overflowRect = box->visualOverflowRect();
-            if (bbox != overflowRect)
-                result.unite(overflowRect);
-        }
+        } else
+            result = box->visualOverflowRect();
     }
     return result;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -515 +515 @@
 }
 
-LayoutRect RenderView::visualOverflowRect() const
-{
-    if (frameView().paintsEntireContents())
-        return layoutOverflowRect();
-
-    return RenderBlockFlow::visualOverflowRect();
-}
-
 Optional<LayoutRect> RenderView::computeVisibleRectInContainer(const LayoutRect& rect, const RenderLayerModelObject* container, VisibleRectContext context) const
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -69 +69 @@
     FrameView& frameView() const { return m_frameView; }
 
-    LayoutRect visualOverflowRect() const override;
     Optional<LayoutRect> computeVisibleRectInContainer(const LayoutRect&, const RenderLayerModelObject* container, VisibleRectContext) const override;
     void repaintRootContents();