Changeset 239645 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Jan 4, 2019, 4:08:28 PM (6 years ago)

Author:

Alan Bujtas

Message:

[iOS] ERROR: post-layout: dirty renderer(s) in WebCore::RenderTreeNeedsLayoutChecker::~RenderTreeNeedsLayoutChecker()
​https://bugs.webkit.org/show_bug.cgi?id=189608
<rdar://problem/44473299>

Reviewed by Simon Fraser.

When a frameset/iframe is hidden and we skip layout, clear the dirty flag on its subtree as well.

Covered by fast/frames/invalid-frameset.html.

• rendering/RenderFrameSet.cpp:

(WebCore::clearSiblingSubtrees):
(WebCore::RenderFrameSet::positionFrames):
(WebCore::RenderFrameSet::positionFramesWithFlattening):

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -495 +495 @@
 }
 
+static void resetFrameRendererAndDescendents(RenderBox* frameSetChild, RenderFrameSet& parentFrameSet)
+{
+    if (!frameSetChild)
+        return;
+
+    for (auto* descendant = frameSetChild; descendant; descendant = downcast<RenderBox>(RenderObjectTraversal::next(*descendant, &parentFrameSet))) {
+        descendant->setWidth(0);
+        descendant->setHeight(0);
+        descendant->clearNeedsLayout();
+    }
+}
+
 void RenderFrameSet::positionFrames()
 {
@@ -535 +547 @@
     }
 
-    // all the remaining frames are hidden to avoid ugly spurious unflowed frames
-    for (auto* descendant = child; descendant; descendant = downcast<RenderBox>(RenderObjectTraversal::next(*descendant, this))) {
-        descendant->setWidth(0);
-        descendant->setHeight(0);
-        descendant->clearNeedsLayout();
-    }
+    resetFrameRendererAndDescendents(child, *this);
 }
 
@@ -643 +650 @@
         repaint();
 
-    // all the remaining frames are hidden to avoid ugly spurious unflowed frames
-    for (; child; child = child->nextSiblingBox()) {
-        child->setWidth(0);
-        child->setHeight(0);
-        child->clearNeedsLayout();
-    }
+    resetFrameRendererAndDescendents(child, *this);
 }