Changeset 240049 in webkit

Timestamp:

Jan 16, 2019 12:51:19 PM (5 years ago)

Author:

youenn@apple.com

Message:

ServiceWorkerContainer is leaking due to a ref cycle
​https://bugs.webkit.org/show_bug.cgi?id=193462
<rdar://problem/47026303>

Reviewed by Brady Eidson.

ServiceWorkerContainer keeps a reference to its ready promise.
The ready promise keeps a ref to its value which is a ServiceWorkerRegistration.
ServiceWorkerRegistration keeps a ref to ServiceWorkerContainer.

To break the reference cycle, set the ready promise to zero when ServiceWorkerContainer is stopped.

Covered by imported/w3c/web-platform-tests/service-workers/service-worker/ready.https.html no longer leaking.

• workers/service/ServiceWorkerContainer.cpp:

(WebCore::ServiceWorkerContainer::stop):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/ServiceWorkerContainer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-16  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerContainer is leaking due to a ref cycle
+        https://bugs.webkit.org/show_bug.cgi?id=193462
+        <rdar://problem/47026303>
+
+        Reviewed by Brady Eidson.
+
+        ServiceWorkerContainer keeps a reference to its ready promise.
+        The ready promise keeps a ref to its value which is a ServiceWorkerRegistration.
+        ServiceWorkerRegistration keeps a ref to ServiceWorkerContainer.
+
+        To break the reference cycle, set the ready promise to zero when ServiceWorkerContainer is stopped.
+
+        Covered by imported/w3c/web-platform-tests/service-workers/service-worker/ready.https.html no longer leaking.
+
+        * workers/service/ServiceWorkerContainer.cpp:
+        (WebCore::ServiceWorkerContainer::stop):
+
 2019-01-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp

@@ -633 +633 @@
     removeAllEventListeners();
     m_pendingPromises.clear();
+    m_readyPromise = nullptr;
     for (auto& job : m_jobMap.values())
         job->cancelPendingLoad();