Changeset 223696 in webkit

Timestamp:

Oct 19, 2017 11:39:39 AM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Do not reenter FrameView::performPostLayoutTasks
​https://bugs.webkit.org/show_bug.cgi?id=178518
<rdar://problem/35075409>

Reviewed by Antti Koivisto.

This patch tightens existing reentrancy policy on performPostLayoutTasks.

Covered by existing test cases.

• page/FrameView.cpp:

(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::layout):
(WebCore::FrameView::performPostLayoutTasks):

• page/FrameView.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-19  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Do not reenter FrameView::performPostLayoutTasks
+        https://bugs.webkit.org/show_bug.cgi?id=178518
+        <rdar://problem/35075409>
+
+        Reviewed by Antti Koivisto.
+
+        This patch tightens existing reentrancy policy on performPostLayoutTasks.
+
+        Covered by existing test cases.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::performPostLayoutTasks):
+        * page/FrameView.h:
+
 2017-10-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -243 +243 @@
     , m_layoutTimer(*this, &FrameView::layoutTimerFired)
     , m_layoutPhase(OutsideLayout)
-    , m_inSynchronousPostLayout(false)
     , m_postLayoutTasksTimer(*this, &FrameView::performPostLayoutTasks)
     , m_updateEmbeddedObjectsTimer(*this, &FrameView::updateEmbeddedObjectsTimerFired)
@@ -342 +341 @@
     m_layoutSchedulingEnabled = true;
     m_layoutPhase = OutsideLayout;
-    m_inSynchronousPostLayout = false;
     m_layoutCount = 0;
     m_postLayoutTasksTimer.stop();
@@ -1396 +1394 @@
     {
         SetForScope<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
-
-        if (!isLayoutNested() && !m_inSynchronousPostLayout && m_postLayoutTasksTimer.isActive() && !isInChildFrameWithFrameFlattening()) {
-            // This is a new top-level layout. If there are any remaining tasks from the previous
-            // layout, finish them now.
-            SetForScope<bool> inSynchronousPostLayoutChange(m_inSynchronousPostLayout, true);
+        // If this is a new top-level layout and there are any remaining tasks from the previous layout, finish them now.
+        if (!isLayoutNested() && m_postLayoutTasksTimer.isActive() && !isInChildFrameWithFrameFlattening())
             performPostLayoutTasks();
-        }
 
         // Viewport-dependent media queries may cause us to need completely different style information.
@@ -1554 +1548 @@
 
     if (!m_postLayoutTasksTimer.isActive()) {
-        if (!m_inSynchronousPostLayout) {
+        if (!m_inPerformPostLayoutTasks) {
             if (isInChildFrameWithFrameFlattening())
                 updateWidgetPositions();
-            else {
-                SetForScope<bool> inSynchronousPostLayoutChange(m_inSynchronousPostLayout, true);
+            else
                 performPostLayoutTasks(); // Calls resumeScheduledEvents().
-            }
         }
 
-        if (!m_postLayoutTasksTimer.isActive() && (needsLayout() || m_inSynchronousPostLayout || isInChildFrameWithFrameFlattening())) {
+        if (!m_postLayoutTasksTimer.isActive() && (needsLayout() || m_inPerformPostLayoutTasks || isInChildFrameWithFrameFlattening())) {
             // If we need layout or are already in a synchronous call to postLayoutTasks(), 
             // defer widget updates and event dispatch until after we return. postLayoutTasks()
@@ -3502 +3494 @@
 void FrameView::performPostLayoutTasks()
 {
+    if (m_inPerformPostLayoutTasks)
+        return;
+
+    SetForScope<bool> inPerformPostLayoutTasks(m_inPerformPostLayoutTasks, true);
     // FIXME: We should not run any JavaScript code in this function.
     LOG(Layout, "FrameView %p performPostLayoutTasks", this);

trunk/Source/WebCore/page/FrameView.h

@@ -806 +806 @@
     LayoutPhase m_layoutPhase;
     bool m_layoutSchedulingEnabled;
-    bool m_inSynchronousPostLayout;
+    bool m_inPerformPostLayoutTasks { false };
     int m_layoutCount;
     enum class LayoutNestedState { NotInLayout, NotNested, Nested };