Changeset 242677 in webkit

Timestamp:

Mar 9, 2019, 7:26:10 PM (7 years ago)

Author:

Chris Dumez

Message:

Add assertions to help debug crash under DOMWindowExtension::suspendForPageCache()
​https://bugs.webkit.org/show_bug.cgi?id=195488

Reviewed by Ryosuke Niwa.

Try and figure out how the document can be detached from its frame while we're suspending
DOMWindowExtensions.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::willDetachDocumentFromFrame):
(WebCore::DOMWindow::suspendForPageCache):

• page/DOMWindow.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/DOMWindow.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-09  Chris Dumez  <cdumez@apple.com>
+
+        Add assertions to help debug crash under DOMWindowExtension::suspendForPageCache()
+        https://bugs.webkit.org/show_bug.cgi?id=195488
+
+        Reviewed by Ryosuke Niwa.
+
+        Try and figure out how the document can be detached from its frame while we're suspending
+        DOMWindowExtensions.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::willDetachDocumentFromFrame):
+        (WebCore::DOMWindow::suspendForPageCache):
+        * page/DOMWindow.h:
+
 2019-03-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -120 +120 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/Ref.h>
+#include <wtf/SetForScope.h>
 #include <wtf/Variant.h>
 #include <wtf/text/WTFString.h>
@@ -474 +475 @@
         return;
 
+    RELEASE_ASSERT(!m_isSuspendingObservers);
+
     // It is necessary to copy m_observers to a separate vector because the Observer may
     // unregister themselves from the DOMWindow as a result of the call to willDetachGlobalObjectFromFrame.
@@ -522 +525 @@
 void DOMWindow::suspendForPageCache()
 {
+    SetForScope<bool> isSuspendingObservers(m_isSuspendingObservers, true);
+    RELEASE_ASSERT(frame());
+
     for (auto* observer : copyToVector(m_observers)) {
         if (m_observers.contains(observer))
             observer->suspendForPageCache();
     }
+    RELEASE_ASSERT(frame());
 
     m_suspendedForDocumentSuspension = true;

trunk/Source/WebCore/page/DOMWindow.h

@@ -394 +394 @@
     bool m_shouldPrintWhenFinishedLoading { false };
     bool m_suspendedForDocumentSuspension { false };
+    bool m_isSuspendingObservers { false };
     Optional<bool> m_canShowModalDialogOverride;