Changeset 295665 in webkit for trunk/Source/WebCore/rendering/RenderObject.cpp

Timestamp:

Jun 19, 2022, 8:57:23 PM (3 years ago)

Author:

Alan Bujtas

Message:

REGRESSION (r294902): Content with continuation leaves decoration bits behind when removed
​https://bugs.webkit.org/show_bug.cgi?id=241734
<rdar://95308322>

Reviewed by Simon Fraser.

This patch ensures that when a renderer is removed we always issue a repaint regardless of what the associated layer's repaint bit says.

1. after r294902, repaint is not issued anymore if either the associated or an ancestor layer have the "full repaint" bit set.
2. such layer-driven repaints happen after layout.

In some dynamic content cases, the layer may be removed before layout happens. This patch ensures that we preemptively issue such repaints.

• LayoutTests/fast/repaint/force-repaint-when-layer-is-destroyed-expected.txt: Added.
• LayoutTests/fast/repaint/force-repaint-when-layer-is-destroyed.html: Added.

• Source/WebCore/rendering/RenderLayerModelObject.cpp: Force (full) repaint when the renderer is being destroyed (detached -> non-internal move).

(WebCore::RenderLayerModelObject::willBeRemovedFromTree):

• Source/WebCore/rendering/RenderLayerModelObject.h:
• Source/WebCore/rendering/RenderObject.cpp: move duplicated code from repaint() and repaintRectangle() to issueRepaint().

Canonical link: ​https://commits.webkit.org/251670@main

File:

• trunk/Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -978 +978 @@
 }
 
-void RenderObject::repaint() const
-{
-    // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
-    if (!isRooted())
-        return;
-
-    const RenderView& view = this->view();
-    if (view.printing())
-        return;
-
+void RenderObject::issueRepaint(std::optional<LayoutRect> partialRepaintRect, ClipRepaintToLayer clipRepaintToLayer, ForceRepaint forceRepaint) const
+{
     auto repaintContainer = containerForRepaint();
     if (!repaintContainer.renderer)
-        repaintContainer = { fullRepaintIsScheduled(*this), &view };
-
-    if (!repaintContainer.fullRepaintIsScheduled)
-        repaintUsingContainer(repaintContainer.renderer, clippedOverflowRectForRepaint(repaintContainer.renderer));
-}
-
-void RenderObject::repaintRectangle(const LayoutRect& r, bool shouldClipToLayer) const
+        repaintContainer = { fullRepaintIsScheduled(*this), &view() };
+
+    if (repaintContainer.fullRepaintIsScheduled && forceRepaint == ForceRepaint::No)
+        return;
+
+    auto repaintRect = partialRepaintRect ? computeRectForRepaint(*partialRepaintRect, repaintContainer.renderer) : clippedOverflowRectForRepaint(repaintContainer.renderer);
+    repaintUsingContainer(repaintContainer.renderer, repaintRect, clipRepaintToLayer == ClipRepaintToLayer::Yes);
+}
+
+void RenderObject::repaint() const
 {
     // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
-    if (!isRooted())
-        return;
-
-    const RenderView& view = this->view();
-    if (view.printing())
-        return;
-
-    LayoutRect dirtyRect(r);
+    if (!isRooted() || view().printing())
+        return;
+    issueRepaint();
+}
+
+void RenderObject::repaintRectangle(const LayoutRect& repaintRect, bool shouldClipToLayer) const
+{
+    // Don't repaint if we're unrooted (note that view() still returns the view when unrooted)
+    if (!isRooted() || view().printing())
+        return;
     // FIXME: layoutDelta needs to be applied in parts before/after transforms and
     // repaint containers. https://bugs.webkit.org/show_bug.cgi?id=23308
-    dirtyRect.move(view.frameView().layoutContext().layoutDelta());
-
-    auto repaintContainer = containerForRepaint();
-    if (!repaintContainer.renderer)
-        repaintContainer = { fullRepaintIsScheduled(*this), &view };
-
-    if (!repaintContainer.fullRepaintIsScheduled)
-        repaintUsingContainer(repaintContainer.renderer, computeRectForRepaint(dirtyRect, repaintContainer.renderer), shouldClipToLayer);
+    auto dirtyRect = repaintRect;
+    dirtyRect.move(view().frameView().layoutContext().layoutDelta());
+    issueRepaint(dirtyRect, shouldClipToLayer ? ClipRepaintToLayer::Yes : ClipRepaintToLayer::No);
 }