Changeset 242797 in webkit

Timestamp:

Mar 12, 2019, 9:50:46 AM (7 years ago)

Author:

rniwa@webkit.org

Message:

In CachedFrame's constructor, release-assert that DOMWindow still has a frame after page-caching subframes
​https://bugs.webkit.org/show_bug.cgi?id=195609

Reviewed by Chris Dumez.

r242677 added release assertions to DOMWindow::suspendForPageCache. But when the first release assert in
that function is hit, we still can't tell whether active DOM objects are detaching frames, or if creating
CachedFrame's on one of subframes is causing the frame to go way.

Add a release assertion immediately after creating CachedFrame on subframes to detect this case.

• history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/CachedFrame.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        In CachedFrame's constructor, release-assert that DOMWindow still has a frame after page-caching subframes
+        https://bugs.webkit.org/show_bug.cgi?id=195609
+
+        Reviewed by Chris Dumez.
+
+        r242677 added release assertions to DOMWindow::suspendForPageCache. But when the first release assert in
+        that function is hit, we still can't tell whether active DOM objects are detaching frames, or if creating
+        CachedFrame's on one of subframes is causing the frame to go way.
+
+        Add a release assertion immediately after creating CachedFrame on subframes to detect this case.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame):
+
 2019-03-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -148 +148 @@
         m_childFrames.append(std::make_unique<CachedFrame>(*child));
 
+    RELEASE_ASSERT(m_document->domWindow()->frame());
+
     // Active DOM objects must be suspended before we cache the frame script data.
     m_document->suspend(ReasonForSuspension::PageCache);