Changeset 262133 in webkit

Timestamp:

May 25, 2020 5:27:12 PM (4 years ago)

Author:

Simon Fraser

Message:

Use an Optional<> for LayerFragment::boundingBox
​https://bugs.webkit.org/show_bug.cgi?id=212358

Reviewed by Zalan Bujtas.

Replace a bool + LayoutRect with Optional<LayoutRect>.

• rendering/LayerFragment.h:

(WebCore::LayerFragment::setRects):
(WebCore::LayerFragment::moveBy):
(WebCore::LayerFragment::intersect):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::collectFragments):
(WebCore::RenderLayer::updatePaintingInfoForFragments):
(WebCore::RenderLayer::calculateClipRects const):

• rendering/RenderLayer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayerFragment.h (modified) (4 diffs)
• rendering/RenderLayer.cpp (modified) (4 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Use an Optional<> for LayerFragment::boundingBox
+        https://bugs.webkit.org/show_bug.cgi?id=212358
+
+        Reviewed by Zalan Bujtas.
+
+        Replace a bool + LayoutRect with Optional<LayoutRect>.
+
+        * rendering/LayerFragment.h:
+        (WebCore::LayerFragment::setRects):
+        (WebCore::LayerFragment::moveBy):
+        (WebCore::LayerFragment::intersect):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::collectFragments):
+        (WebCore::RenderLayer::updatePaintingInfoForFragments):
+        (WebCore::RenderLayer::calculateClipRects const):
+        * rendering/RenderLayer.h:
+
 2020-05-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/LayerFragment.h

@@ -34 +34 @@
     LayerFragment() = default;
     
-    void setRects(const LayoutRect& bounds, const ClipRect& background, const ClipRect& foreground, const LayoutRect* bbox)
+    void setRects(const LayoutRect& bounds, const ClipRect& background, const ClipRect& foreground, const Optional<LayoutRect>& bbox)
     {
         layerBounds = bounds;
         backgroundRect = background;
         foregroundRect = foreground;
-        if (bbox) {
-            boundingBox = *bbox;
-            hasBoundingBox = true;
-        }
+        boundingBox = bbox;
     }
     
@@ -51 +48 @@
         foregroundRect.moveBy(offset);
         paginationClip.moveBy(offset);
-        boundingBox.moveBy(offset);
+        if (boundingBox)
+            boundingBox->moveBy(offset);
     }
     
@@ -58 +56 @@
         backgroundRect.intersect(rect);
         foregroundRect.intersect(rect);
-        boundingBox.intersect(rect);
+        if (boundingBox)
+            boundingBox->intersect(rect);
     }
     
@@ -68 +67 @@
 
     bool shouldPaintContent = false;
-    bool hasBoundingBox = false;
+    Optional<LayoutRect> boundingBox;
+
     LayoutRect layerBounds;
     ClipRect backgroundRect;
     ClipRect foregroundRect;
-    LayoutRect boundingBox;
     
     // Unique to paginated fragments. The physical translation to apply to shift the layer when painting/hit-testing.

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4875 +4875 @@
                 
                 // Set our four rects with all clipping applied that was internal to the flow thread.
-                fragment.setRects(layerBoundsInFragmentedFlow, backgroundRectInFragmentedFlow, foregroundRectInFragmentedFlow, &layerBoundingBoxInFragmentedFlow);
+                fragment.setRects(layerBoundsInFragmentedFlow, backgroundRectInFragmentedFlow, foregroundRectInFragmentedFlow, layerBoundingBoxInFragmentedFlow);
                 
                 // Shift to the root-relative physical position used when painting the flow thread in this fragment.
@@ -4918 +4918 @@
     for (auto& fragment : fragments) {
         // Set our four rects with all clipping applied that was internal to the flow thread.
-        fragment.setRects(layerBoundsInFragmentedFlow, backgroundRectInFragmentedFlow, foregroundRectInFragmentedFlow, &layerBoundingBoxInFragmentedFlow);
+        fragment.setRects(layerBoundsInFragmentedFlow, backgroundRectInFragmentedFlow, foregroundRectInFragmentedFlow, layerBoundingBoxInFragmentedFlow);
         
         // Shift to the root-relative physical position used when painting the flow thread in this fragment.
@@ -4943 +4943 @@
         if (this != localPaintingInfo.rootLayer || !(localPaintFlags & PaintLayerPaintingOverflowContents)) {
             LayoutSize newOffsetFromRoot = offsetFromRoot + fragment.paginationOffset;
-            fragment.shouldPaintContent &= intersectsDamageRect(fragment.layerBounds, fragment.backgroundRect.rect(), localPaintingInfo.rootLayer, newOffsetFromRoot, fragment.hasBoundingBox ? &fragment.boundingBox : 0);
+            fragment.shouldPaintContent &= intersectsDamageRect(fragment.layerBounds, fragment.backgroundRect.rect(), localPaintingInfo.rootLayer, newOffsetFromRoot, fragment.boundingBox);
         }
     }
@@ -5996 +5996 @@
 }
 
-bool RenderLayer::intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const RenderLayer* rootLayer, const LayoutSize& offsetFromRoot, const LayoutRect* cachedBoundingBox) const
+bool RenderLayer::intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const RenderLayer* rootLayer, const LayoutSize& offsetFromRoot, const Optional<LayoutRect>& cachedBoundingBox) const
 {
     // Always examine the canvas and the root.

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -734 +734 @@
 
     // Pass offsetFromRoot if known.
-    bool intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const RenderLayer* rootLayer, const LayoutSize& offsetFromRoot, const LayoutRect* cachedBoundingBox = nullptr) const;
+    bool intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const RenderLayer* rootLayer, const LayoutSize& offsetFromRoot, const Optional<LayoutRect>& cachedBoundingBox = WTF::nullopt) const;
 
     enum CalculateLayerBoundsFlag {