Changeset 223633 in webkit

Timestamp:

Oct 18, 2017 3:27:55 PM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Use SetForScope to protect m_needsFullRepaint's value on reentrancy
​https://bugs.webkit.org/show_bug.cgi?id=178479
<rdar://problem/35056950>

Reviewed by Simon Fraser.

No change in functionality.

• page/FrameView.cpp:

(WebCore::FrameView::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-18  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Use SetForScope to protect m_needsFullRepaint's value on reentrancy
+        https://bugs.webkit.org/show_bug.cgi?id=178479
+        <rdar://problem/35056950>
+
+        Reviewed by Simon Fraser.
+
+        No change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2017-10-18  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1518 +1518 @@
         // Close block here to end the scope of changeSchedulingEnabled and SubtreeLayoutStateMaintainer.
     }
-
-    m_layoutPhase = InViewSizeAdjust;
-
-    bool neededFullRepaint = m_needsFullRepaint;
-
     if (!isSubtreeLayout && !downcast<RenderView>(*layoutRoot).printing()) {
+        // This is to protect m_needsFullRepaint's value when layout() is getting re-entered through adjustViewSize().
+        SetForScope<bool> needsFullRepaint(m_needsFullRepaint);
+        m_layoutPhase = InViewSizeAdjust;
         adjustViewSize();
         // FIXME: Firing media query callbacks synchronously on nested frames could produced a detached FrameView here by
@@ -1530 +1528 @@
             return;
     }
-
     m_layoutPhase = InPostLayout;
-
-    m_needsFullRepaint = neededFullRepaint;
-
     // Now update the positions of all layers.
     if (m_needsFullRepaint)