Stop to use ActiveDOMObject::setPendingActivity() for Modules/fetch

https://bugs.webkit.org/show_bug.cgi?id=213037

Patch by Tetsuharu Ohzeki <[email protected]> on 2020-06-12
Reviewed by Youenn Fablet.

By ActiveDOMObject's comments,
these methods should be replaced with using makePendingActivity().

`JSFetchRequest`/`JSFetchResponse` (as derived class of `JSDOMWrapper`) hold
`FetchRequest`/`FetchResponse`, and they have `FetchBodyOwner`
as a base class and keep alive it. We can replace
`setPendingActivity()` calling from `FetchBodyOwner`.

* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::loadBlob):
(WebCore::FetchBodyOwner::finishBlobLoading):
(WebCore::FetchBodyOwner::virtualHasPendingActivity const):
* Modules/fetch/FetchBodyOwner.h:
* Modules/fetch/FetchBodySource.cpp:
(WebCore::FetchBodySource::setActive):
(WebCore::FetchBodySource::setInactive):
* Modules/fetch/FetchBodySource.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@262972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/WebCore/ChangeLog

@@ -1,3 +1,29 @@
+2020-06-12  Tetsuharu Ohzeki  <[email protected]>
+
+        Stop to use ActiveDOMObject::setPendingActivity() for Modules/fetch
+        https://bugs.webkit.org/show_bug.cgi?id=213037
+
+        Reviewed by Youenn Fablet.
+
+        By ActiveDOMObject's comments,
+        these methods should be replaced with using makePendingActivity().
+
+        `JSFetchRequest`/`JSFetchResponse` (as derived class of `JSDOMWrapper`) hold
+        `FetchRequest`/`FetchResponse`, and they have `FetchBodyOwner`
+        as a base class and keep alive it. We can replace
+        `setPendingActivity()` calling from `FetchBodyOwner`.
+
+        * Modules/fetch/FetchBodyOwner.cpp:
+        (WebCore::FetchBodyOwner::loadBlob):
+        (WebCore::FetchBodyOwner::finishBlobLoading):
+        (WebCore::FetchBodyOwner::virtualHasPendingActivity const):
+        * Modules/fetch/FetchBodyOwner.h:
+        * Modules/fetch/FetchBodySource.cpp:
+        (WebCore::FetchBodySource::setActive):
+        (WebCore::FetchBodySource::setInactive):
+        * Modules/fetch/FetchBodySource.h:
+
+
 2020-06-12  Takashi Komori  <[email protected]>
 
         [Curl] Implement functions to use ResourceLoadStatistics.

Source/WebCore/Modules/fetch/FetchBodyOwner.cpp

@@ -256,15 +256,13 @@ void FetchBodyOwner::loadBlob(const Blob& blob, FetchBodyConsumer* consumer)
         m_blobLoader = WTF::nullopt;
         return;
     }
-    setPendingActivity(*this);
 }
 
 void FetchBodyOwner::finishBlobLoading()
 {
     ASSERT(m_blobLoader);
 
     m_blobLoader = WTF::nullopt;
-    unsetPendingActivity(*this);
 }
 
 void FetchBodyOwner::blobLoadingSucceeded()
@@ -384,6 +382,11 @@ Optional<Exception> FetchBodyOwner::loadingException() const
     });
 }
 
+bool FetchBodyOwner::virtualHasPendingActivity() const
+{
+    return !!m_blobLoader;
+}
+
 bool FetchBodyOwner::hasLoadingError() const
 {
     return WTF::switchOn(m_loadingError, [](const ResourceError&) {

Source/WebCore/Modules/fetch/FetchBodyOwner.h

@@ -102,6 +102,9 @@ class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject
     void blobLoadingFailed();
     void finishBlobLoading();
 
+    // ActiveDOMObject API
+    bool virtualHasPendingActivity() const final;
+
     struct BlobLoader final : FetchLoaderClient {
         BlobLoader(FetchBodyOwner&);
 

Source/WebCore/Modules/fetch/FetchBodySource.cpp

@@ -41,15 +41,16 @@ FetchBodySource::FetchBodySource(FetchBodyOwner& bodyOwner)
 void FetchBodySource::setActive()
 {
     ASSERT(m_bodyOwner);
+    ASSERT(!m_pendingActivity);
     if (m_bodyOwner)
-        m_bodyOwner->setPendingActivity(*m_bodyOwner);
+        m_pendingActivity = m_bodyOwner->makePendingActivity(*m_bodyOwner);
 }
 
 void FetchBodySource::setInactive()
 {
     ASSERT(m_bodyOwner);
-    if (m_bodyOwner)
-        m_bodyOwner->unsetPendingActivity(*m_bodyOwner);
+    ASSERT(m_pendingActivity);
+    m_pendingActivity = nullptr;
 }
 
 void FetchBodySource::doStart()

Source/WebCore/Modules/fetch/FetchBodySource.h

@@ -28,6 +28,7 @@
 
 #if ENABLE(STREAMS_API)
 
+#include "ActiveDOMObject.h"
 #include "ReadableStreamSource.h"
 
 namespace JSC {
@@ -63,6 +64,7 @@ class FetchBodySource final : public ReadableStreamSource {
 #if ASSERT_ENABLED
     bool m_isClosed { false };
 #endif
+    RefPtr<ActiveDOMObject::PendingActivity<FetchBodyOwner>> m_pendingActivity;
 };
 
 } // namespace WebCore