| Index: Source/modules/serviceworkers/FetchManager.cpp
|
| diff --git a/Source/modules/serviceworkers/FetchManager.cpp b/Source/modules/serviceworkers/FetchManager.cpp
|
| index 8a42a91ca6f392f019d264d5f7d6ab1a28eed5f2..a2f546750d866b58bbdbae64532ba6952b3dd3b7 100644
|
| --- a/Source/modules/serviceworkers/FetchManager.cpp
|
| +++ b/Source/modules/serviceworkers/FetchManager.cpp
|
| @@ -27,7 +27,7 @@ namespace blink {
|
|
|
| class FetchManager::Loader : public ThreadableLoaderClient {
|
| public:
|
| - Loader(ExecutionContext*, FetchManager*, PassRefPtr<ScriptPromiseResolver>, const FetchRequestData*);
|
| + Loader(ExecutionContext*, FetchManager*, PassRefPtrWillBeRawPtr<ScriptPromiseResolver>, const FetchRequestData*);
|
| ~Loader();
|
| virtual void didReceiveResponse(unsigned long, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>);
|
| virtual void didFinishLoading(unsigned long, double);
|
| @@ -48,7 +48,7 @@ private:
|
|
|
| ExecutionContext* m_executionContext;
|
| FetchManager* m_fetchManager;
|
| - RefPtr<ScriptPromiseResolver> m_resolver;
|
| + RefPtrWillBeCrossThreadPersistent<ScriptPromiseResolver> m_resolver;
|
| Persistent<FetchRequestData> m_request;
|
| RefPtr<ThreadableLoader> m_loader;
|
| ResourceResponse m_response;
|
| @@ -58,7 +58,7 @@ private:
|
| bool m_failed;
|
| };
|
|
|
| -FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtr<ScriptPromiseResolver> resolver, const FetchRequestData* request)
|
| +FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, const FetchRequestData* request)
|
| : m_executionContext(executionContext)
|
| , m_fetchManager(fetchManager)
|
| , m_resolver(resolver)
|
| @@ -361,7 +361,7 @@ FetchManager::~FetchManager()
|
|
|
| ScriptPromise FetchManager::fetch(ScriptState* scriptState, const FetchRequestData* request)
|
| {
|
| - RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| + RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| ScriptPromise promise = resolver->promise();
|
|
|
| OwnPtr<Loader> ownLoader(adoptPtr(new Loader(m_executionContext, this, resolver.release(), request)));
|
|
|