Commit 868257bd authored by sigbjornf@opera.com's avatar sigbjornf@opera.com

Oilpan: fix build after r178904.

R=haraken@chromium.org
BUG=373120
NOTRY=true

Review URL: https://codereview.chromium.org/422473002

git-svn-id: svn://svn.chromium.org/blink/trunk@178909 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e3603015
......@@ -26,7 +26,7 @@ namespace blink {
class FetchManager::Loader : public ThreadableLoaderClient {
public:
Loader(ExecutionContext*, FetchManager*, PassRefPtr<ScriptPromiseResolver>, PassRefPtr<FetchRequestData>);
Loader(ExecutionContext*, FetchManager*, PassRefPtr<ScriptPromiseResolver>, PassRefPtrWillBeRawPtr<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;
RefPtr<FetchRequestData> m_request;
RefPtrWillBePersistent<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, PassRefPtr<FetchRequestData> request)
FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtr<ScriptPromiseResolver> resolver, PassRefPtrWillBeRawPtr<FetchRequestData> request)
: m_executionContext(executionContext)
, m_fetchManager(fetchManager)
, m_resolver(resolver)
......@@ -88,7 +88,7 @@ void FetchManager::Loader::didFinishLoading(unsigned long, double)
blobData->appendFile(filePath);
blobData->setContentType(m_response.mimeType());
}
RefPtr<FetchResponseData> response(FetchResponseData::create());
RefPtrWillBeRawPtr<FetchResponseData> response(FetchResponseData::create());
response->setStatus(m_response.httpStatusCode());
response->setStatusMessage(m_response.httpStatusText());
HTTPHeaderMap::const_iterator end = m_response.httpHeaderFields().end();
......@@ -336,7 +336,7 @@ FetchManager::~FetchManager()
}
}
ScriptPromise FetchManager::fetch(ScriptState* scriptState, PassRefPtr<FetchRequestData> request)
ScriptPromise FetchManager::fetch(ScriptState* scriptState, PassRefPtrWillBeRawPtr<FetchRequestData> request)
{
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
......
......@@ -20,7 +20,7 @@ class FetchManager {
public:
FetchManager(ExecutionContext*);
~FetchManager();
ScriptPromise fetch(ScriptState*, PassRefPtr<FetchRequestData>);
ScriptPromise fetch(ScriptState*, PassRefPtrWillBeRawPtr<FetchRequestData>);
static bool isSimpleMethod(const String&);
static bool isForbiddenMethod(const String&);
......
......@@ -102,7 +102,7 @@ ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, Request*
// value of Request as constructor with |input| and |init| as arguments. If
// this throws an exception, reject |p| with it."
TrackExceptionState exceptionState;
RefPtr<Request> r = Request::create(this, request, exceptionState);
RefPtrWillBeRawPtr<Request> r = Request::create(this, request, exceptionState);
if (exceptionState.hadException()) {
// FIXME: We should throw the caught error.
return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
......@@ -118,7 +118,7 @@ ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, Request*
// value of Request as constructor with |input| and |init| as arguments. If
// this throws an exception, reject |p| with it."
TrackExceptionState exceptionState;
RefPtr<Request> r = Request::create(this, request, requestInit, exceptionState);
RefPtrWillBeRawPtr<Request> r = Request::create(this, request, requestInit, exceptionState);
if (exceptionState.hadException()) {
// FIXME: We should throw the caught error.
return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
......@@ -134,7 +134,7 @@ ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, const St
// value of Request as constructor with |input| and |init| as arguments. If
// this throws an exception, reject |p| with it."
TrackExceptionState exceptionState;
RefPtr<Request> r = Request::create(this, urlstring, exceptionState);
RefPtrWillBeRawPtr<Request> r = Request::create(this, urlstring, exceptionState);
if (exceptionState.hadException()) {
// FIXME: We should throw the caught error.
return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
......@@ -150,7 +150,7 @@ ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, const St
// value of Request as constructor with |input| and |init| as arguments. If
// this throws an exception, reject |p| with it."
TrackExceptionState exceptionState;
RefPtr<Request> r = Request::create(this, urlstring, requestInit, exceptionState);
RefPtrWillBeRawPtr<Request> r = Request::create(this, urlstring, requestInit, exceptionState);
if (exceptionState.hadException()) {
// FIXME: We should throw the caught error.
return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment