Have ScriptPromiseResolver on the Oilpan heap always.

Source/modules/fetch/Body.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/fetch/Body.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 10 matching lines @@
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 namespace {
 
 class BodyConsumerBase : public GarbageCollectedFinalized<BodyConsumerBase>, public FetchDataLoader::Client {
     WTF_MAKE_NONCOPYABLE(BodyConsumerBase);
     USING_GARBAGE_COLLECTED_MIXIN(BodyConsumerBase);
 public:
-    explicit BodyConsumerBase(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : m_resolver(resolver) {}
-    PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver() { return m_resolver; }
+    explicit BodyConsumerBase(ScriptPromiseResolver* resolver) : m_resolver(resolver) {}
+    ScriptPromiseResolver* resolver() { return m_resolver; }
     void didFetchDataLoadFailed() override
     {
         ScriptState::Scope scope(resolver()->scriptState());
         m_resolver->reject(V8ThrowException::createTypeError(resolver()->scriptState()->isolate(), "Failed to fetch"));
     }
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_resolver);
         FetchDataLoader::Client::trace(visitor);
     }
 
 private:
-    RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
+    Member<ScriptPromiseResolver> m_resolver;
 };
 
 class BodyBlobConsumer final : public BodyConsumerBase {
     WTF_MAKE_NONCOPYABLE(BodyBlobConsumer);
 public:
-    explicit BodyBlobConsumer(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : BodyConsumerBase(resolver) {}
+    explicit BodyBlobConsumer(ScriptPromiseResolver* resolver) : BodyConsumerBase(resolver) {}
 
     void didFetchDataLoadedBlobHandle(PassRefPtr<BlobDataHandle> blobDataHandle) override
     {
         resolver()->resolve(Blob::create(blobDataHandle));
     }
 };
 
 class BodyArrayBufferConsumer final : public BodyConsumerBase {
     WTF_MAKE_NONCOPYABLE(BodyArrayBufferConsumer);
 public:
-    explicit BodyArrayBufferConsumer(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : BodyConsumerBase(resolver) {}
+    explicit BodyArrayBufferConsumer(ScriptPromiseResolver* resolver) : BodyConsumerBase(resolver) {}
 
     void didFetchDataLoadedArrayBuffer(PassRefPtr<DOMArrayBuffer> arrayBuffer) override
     {
         resolver()->resolve(arrayBuffer);
     }
 };
 
 class BodyTextConsumer final : public BodyConsumerBase {
     WTF_MAKE_NONCOPYABLE(BodyTextConsumer);
 public:
-    explicit BodyTextConsumer(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : BodyConsumerBase(resolver) {}
+    explicit BodyTextConsumer(ScriptPromiseResolver* resolver) : BodyConsumerBase(resolver) {}
 
     void didFetchDataLoadedString(const String& string) override
     {
         resolver()->resolve(string);
     }
 };
 
 class BodyJsonConsumer final : public BodyConsumerBase {
     WTF_MAKE_NONCOPYABLE(BodyJsonConsumer);
 public:
-    explicit BodyJsonConsumer(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : BodyConsumerBase(resolver) {}
+    explicit BodyJsonConsumer(ScriptPromiseResolver* resolver) : BodyConsumerBase(resolver) {}
 
     void didFetchDataLoadedString(const String& string) override
     {
         if (!resolver()->executionContext() || resolver()->executionContext()->activeDOMObjectsAreStopped())
             return;
         ScriptState::Scope scope(resolver()->scriptState());
         v8::Isolate* isolate = resolver()->scriptState()->isolate();
         v8::Local<v8::String> inputString = v8String(isolate, string);
         v8::TryCatch trycatch;
         v8::Local<v8::Value> parsed;
@@ skipping 13 matching lines @@
 
     // When the main thread sends a V8::TerminateExecution() signal to a worker
     // thread, any V8 API on the worker thread starts returning an empty
     // handle. This can happen in Body::readAsync. To avoid the situation, we
     // first check the ExecutionContext and return immediately if it's already
     // gone (which means that the V8::TerminateExecution() signal has been sent
     // to this worker thread).
     if (!scriptState->executionContext())
         return ScriptPromise();
 
-    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), new BodyArrayBufferConsumer(resolver));
     return promise;
 }
 
 ScriptPromise Body::blob(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
-    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsBlobHandle(mimeType()), new BodyBlobConsumer(resolver));
     return promise;
 
 }
 
 ScriptPromise Body::json(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
-    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyJsonConsumer(resolver));
     return promise;
 }
 
 ScriptPromise Body::text(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
-    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyTextConsumer(resolver));
     return promise;
 }
 
 ReadableByteStream* Body::body()
 {
     UseCounter::count(executionContext(), UseCounter::FetchBodyStream);
     return bodyBuffer()->stream();
 }
 
 bool Body::bodyUsed()
 {
     return m_bodyPassed || body()->isLocked();
 }
 
 bool Body::hasPendingActivity() const
 {
     if (executionContext()->activeDOMObjectsAreStopped())
         return false;
     return bodyBuffer()->hasPendingActivity();
 }
 
 Body::Body(ExecutionContext* context) : ActiveDOMObject(context), m_bodyPassed(false)
 {
     suspendIfNeeded();
 }
 
 } // namespace blink