Changeset 244120 in webkit

Timestamp:

Apr 10, 2019, 10:10:56 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r243104. rdar://problem/49725692

REGRESSION(r236862): early frame decoupling leaves JSC ArrayBuffer objects lingering
​https://bugs.webkit.org/show_bug.cgi?id=195322

Reviewed by Ryosuke Niwa.

Since r236862, DOMWindow objects get disconnected from their Frame object as soon as
their iframe element gets removed from the document. Previously, DOMWindow was a
FrameDestructionObserver and would stay connected to its frame until the frame died.

This means that some of the work that we were doing in DOMWindow::frameDestroyed() and
Document::willDetachPage() no longer happens for subframe windows because they get
disconnected from their frame because they get a chance to get such notifications.
To address this issue, we now also do this work in DOMWindow::willDetachDocumentFromFrame()
which gets called when the iframe gets removed from the document and the document / window
get disconnected from the Frame element.

No new tests, verified locally that the leak is gone on JetStream.

• page/DOMWindow.cpp: (WebCore::DOMWindow::willDetachDocumentFromFrame):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@243104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebCore

Files:

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

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-09  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r243104. rdar://problem/49725692
+
+    REGRESSION(r236862): early frame decoupling leaves JSC ArrayBuffer objects lingering
+    https://bugs.webkit.org/show_bug.cgi?id=195322
+    
+    Reviewed by Ryosuke Niwa.
+    
+    Since r236862, DOMWindow objects get disconnected from their Frame object as soon as
+    their iframe element gets removed from the document. Previously, DOMWindow was a
+    FrameDestructionObserver and would stay connected to its frame until the frame died.
+    
+    This means that some of the work that we were doing in DOMWindow::frameDestroyed() and
+    Document::willDetachPage() no longer happens for subframe windows because they get
+    disconnected from their frame because they get a chance to get such notifications.
+    To address this issue, we now also do this work in DOMWindow::willDetachDocumentFromFrame()
+    which gets called when the iframe gets removed from the document and the document / window
+    get disconnected from the Frame element.
+    
+    No new tests, verified locally that the leak is gone on JetStream.
+    
+    * page/DOMWindow.cpp:
+    (WebCore::DOMWindow::willDetachDocumentFromFrame):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243104 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-18  Chris Dumez  <cdumez@apple.com>
+
+            REGRESSION(r236862): early frame decoupling leaves JSC ArrayBuffer objects lingering
+            https://bugs.webkit.org/show_bug.cgi?id=195322
+
+            Reviewed by Ryosuke Niwa.
+
+            Since r236862, DOMWindow objects get disconnected from their Frame object as soon as
+            their iframe element gets removed from the document. Previously, DOMWindow was a
+            FrameDestructionObserver and would stay connected to its frame until the frame died.
+
+            This means that some of the work that we were doing in DOMWindow::frameDestroyed() and
+            Document::willDetachPage() no longer happens for subframe windows because they get
+            disconnected from their frame because they get a chance to get such notifications.
+            To address this issue, we now also do this work in DOMWindow::willDetachDocumentFromFrame()
+            which gets called when the iframe gets removed from the document and the document / window
+            get disconnected from the Frame element.
+
+            No new tests, verified locally that the leak is gone on JetStream.
+
+            * page/DOMWindow.cpp:
+            (WebCore::DOMWindow::willDetachDocumentFromFrame):
+
 2019-04-09  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/WebCore/page/DOMWindow.cpp

@@ -489 +489 @@
     if (m_performance)
         m_performance->clearResourceTimings();
+
+    JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(this);
+    InspectorInstrumentation::frameWindowDiscarded(*frame(), this);
 }