| Index: Source/modules/serviceworkers/FetchManager.cpp
|
| diff --git a/Source/modules/serviceworkers/FetchManager.cpp b/Source/modules/serviceworkers/FetchManager.cpp
|
| index f9d2e124c2833b9dd8ea3cafd5d23f6454209f18..3cbd4b5bc3128793e454850f1b721520ea0ff00a 100644
|
| --- a/Source/modules/serviceworkers/FetchManager.cpp
|
| +++ b/Source/modules/serviceworkers/FetchManager.cpp
|
| @@ -26,7 +26,7 @@ namespace blink {
|
|
|
| class FetchManager::Loader : public ThreadableLoaderClient {
|
| public:
|
| - Loader(ExecutionContext*, FetchManager*, PassRefPtr<ScriptPromiseResolver>, PassRefPtrWillBeRawPtr<FetchRequestData>);
|
| + Loader(ExecutionContext*, FetchManager*, PassRefPtr<ScriptPromiseResolver>, FetchRequestData*);
|
| ~Loader();
|
| virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
|
| virtual void didFinishLoading(unsigned long, double);
|
| @@ -48,7 +48,7 @@ private:
|
| ExecutionContext* m_executionContext;
|
| FetchManager* m_fetchManager;
|
| RefPtr<ScriptPromiseResolver> m_resolver;
|
| - RefPtrWillBePersistent<FetchRequestData> m_request;
|
| + Persistent<FetchRequestData> m_request;
|
| RefPtr<ThreadableLoader> m_loader;
|
| ResourceResponse m_response;
|
| long long m_downloadedBlobLength;
|
| @@ -57,7 +57,7 @@ private:
|
| bool m_failed;
|
| };
|
|
|
| -FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtr<ScriptPromiseResolver> resolver, PassRefPtrWillBeRawPtr<FetchRequestData> request)
|
| +FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtr<ScriptPromiseResolver> resolver, FetchRequestData* request)
|
| : m_executionContext(executionContext)
|
| , m_fetchManager(fetchManager)
|
| , m_resolver(resolver)
|
| @@ -91,7 +91,7 @@ void FetchManager::Loader::didFinishLoading(unsigned long, double)
|
| blobData->appendFile(filePath);
|
| blobData->setContentType(m_response.mimeType());
|
| }
|
| - RefPtrWillBeRawPtr<FetchResponseData> response(FetchResponseData::create());
|
| + FetchResponseData* response = FetchResponseData::create();
|
| response->setStatus(m_response.httpStatusCode());
|
| response->setStatusMessage(m_response.httpStatusText());
|
| HTTPHeaderMap::const_iterator end = m_response.httpHeaderFields().end();
|
| @@ -112,7 +112,7 @@ void FetchManager::Loader::didFinishLoading(unsigned long, double)
|
| response = response->createOpaqueFilteredResponse();
|
| break;
|
| }
|
| - m_resolver->resolve(Response::create(response.release()));
|
| + m_resolver->resolve(Response::create(response));
|
| notifyFinished();
|
| }
|
|
|
| @@ -341,7 +341,7 @@ FetchManager::~FetchManager()
|
| }
|
| }
|
|
|
| -ScriptPromise FetchManager::fetch(ScriptState* scriptState, PassRefPtrWillBeRawPtr<FetchRequestData> request)
|
| +ScriptPromise FetchManager::fetch(ScriptState* scriptState, FetchRequestData* request)
|
| {
|
| RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| ScriptPromise promise = resolver->promise();
|
|
|