| Index: Source/modules/fetch/FetchManager.cpp
|
| diff --git a/Source/modules/fetch/FetchManager.cpp b/Source/modules/fetch/FetchManager.cpp
|
| index 302c0547d0905e51e0fc992fefb40a09a797703c..b1748169c4ea30736b0df0a40f5d9a7338c85498 100644
|
| --- a/Source/modules/fetch/FetchManager.cpp
|
| +++ b/Source/modules/fetch/FetchManager.cpp
|
| @@ -39,7 +39,7 @@ namespace blink {
|
| class FetchManager::Loader final : public NoBaseWillBeGarbageCollectedFinalized<FetchManager::Loader>, public ThreadableLoaderClient, public ContextLifecycleObserver {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FetchManager::Loader);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<Loader> create(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, FetchRequestData* request)
|
| + static PassOwnPtrWillBeRawPtr<Loader> create(ExecutionContext* executionContext, FetchManager* fetchManager, ScriptPromiseResolver* resolver, FetchRequestData* request)
|
| {
|
| return adoptPtrWillBeNoop(new Loader(executionContext, fetchManager, resolver, request));
|
| }
|
| @@ -57,7 +57,7 @@ public:
|
| void dispose();
|
|
|
| private:
|
| - Loader(ExecutionContext*, FetchManager*, PassRefPtrWillBeRawPtr<ScriptPromiseResolver>, FetchRequestData*);
|
| + Loader(ExecutionContext*, FetchManager*, ScriptPromiseResolver*, FetchRequestData*);
|
|
|
| void performBasicFetch();
|
| void performNetworkError(const String& message);
|
| @@ -67,7 +67,7 @@ private:
|
| Document* document() const;
|
|
|
| RawPtrWillBeMember<FetchManager> m_fetchManager;
|
| - RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
|
| + PersistentWillBeMember<ScriptPromiseResolver> m_resolver;
|
| PersistentWillBeMember<FetchRequestData> m_request;
|
| RefPtr<ThreadableLoader> m_loader;
|
| bool m_failed;
|
| @@ -75,7 +75,7 @@ private:
|
| int m_responseHttpStatusCode;
|
| };
|
|
|
| -FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, FetchRequestData* request)
|
| +FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, ScriptPromiseResolver* resolver, FetchRequestData* request)
|
| : ContextLifecycleObserver(executionContext)
|
| , m_fetchManager(fetchManager)
|
| , m_resolver(resolver)
|
| @@ -425,12 +425,12 @@ FetchManager::~FetchManager()
|
|
|
| ScriptPromise FetchManager::fetch(ScriptState* scriptState, FetchRequestData* request)
|
| {
|
| - RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| + ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
|
| ScriptPromise promise = resolver->promise();
|
|
|
| request->setContext(WebURLRequest::RequestContextFetch);
|
|
|
| - OwnPtrWillBeRawPtr<Loader> ownLoader = Loader::create(m_executionContext, this, resolver.release(), request);
|
| + OwnPtrWillBeRawPtr<Loader> ownLoader = Loader::create(m_executionContext, this, resolver, request);
|
| Loader* loader = m_loaders.add(ownLoader.release()).storedValue->get();
|
| loader->start();
|
| return promise;
|
|
|