diff options
Diffstat (limited to 'third_party/WebKit/Source/modules/serviceworkers')
4 files changed, 8 insertions, 8 deletions
diff --git a/third_party/WebKit/Source/modules/serviceworkers/Headers.cpp b/third_party/WebKit/Source/modules/serviceworkers/Headers.cpp index ea86990d..664ea21 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/Headers.cpp +++ b/third_party/WebKit/Source/modules/serviceworkers/Headers.cpp @@ -208,12 +208,12 @@ void Headers::set(const String& name, const String& value, ExceptionState& excep m_headerList->set(name, value); } -void Headers::forEach(PassOwnPtrWillBeRawPtr<HeadersForEachCallback> callback, const ScriptValue& thisArg) +void Headers::forEach(HeadersForEachCallback* callback, const ScriptValue& thisArg) { forEachInternal(callback, &thisArg); } -void Headers::forEach(PassOwnPtrWillBeRawPtr<HeadersForEachCallback> callback) +void Headers::forEach(HeadersForEachCallback* callback) { forEachInternal(callback, 0); } @@ -305,7 +305,7 @@ Headers::Headers(FetchHeaderList* headerList) { } -void Headers::forEachInternal(PassOwnPtrWillBeRawPtr<HeadersForEachCallback> callback, const ScriptValue* thisArg) +void Headers::forEachInternal(HeadersForEachCallback* callback, const ScriptValue* thisArg) { TrackExceptionState exceptionState; for (size_t i = 0; i < m_headerList->size(); ++i) { diff --git a/third_party/WebKit/Source/modules/serviceworkers/Headers.h b/third_party/WebKit/Source/modules/serviceworkers/Headers.h index 7234dc8..48f0632 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/Headers.h +++ b/third_party/WebKit/Source/modules/serviceworkers/Headers.h @@ -41,8 +41,8 @@ public: bool has(const String& key, ExceptionState&); void set(const String& key, const String& value, ExceptionState&); unsigned long size() const; - void forEach(PassOwnPtrWillBeRawPtr<HeadersForEachCallback>, const ScriptValue&); - void forEach(PassOwnPtrWillBeRawPtr<HeadersForEachCallback>); + void forEach(HeadersForEachCallback*, const ScriptValue&); + void forEach(HeadersForEachCallback*); void setGuard(Guard guard) { m_guard = guard; } Guard guard() const { return m_guard; } @@ -57,7 +57,7 @@ private: Headers(); // Shares the FetchHeaderList. Called when creating a Request or Response. explicit Headers(FetchHeaderList*); - void forEachInternal(PassOwnPtrWillBeRawPtr<HeadersForEachCallback>, const ScriptValue*); + void forEachInternal(HeadersForEachCallback*, const ScriptValue*); Member<FetchHeaderList> m_headerList; Guard m_guard; diff --git a/third_party/WebKit/Source/modules/serviceworkers/HeadersForEachCallback.h b/third_party/WebKit/Source/modules/serviceworkers/HeadersForEachCallback.h index 60fe225..285fdef 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/HeadersForEachCallback.h +++ b/third_party/WebKit/Source/modules/serviceworkers/HeadersForEachCallback.h @@ -12,7 +12,7 @@ namespace blink { class Headers; -class HeadersForEachCallback : public NoBaseWillBeGarbageCollectedFinalized<HeadersForEachCallback> { +class HeadersForEachCallback : public GarbageCollectedFinalized<HeadersForEachCallback> { public: virtual ~HeadersForEachCallback() { } virtual void trace(Visitor*) { } diff --git a/third_party/WebKit/Source/modules/serviceworkers/Request.cpp b/third_party/WebKit/Source/modules/serviceworkers/Request.cpp index 04320a4..1e9d1a5 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/Request.cpp +++ b/third_party/WebKit/Source/modules/serviceworkers/Request.cpp @@ -328,7 +328,7 @@ void Request::populateWebServiceWorkerRequest(WebServiceWorkerRequest& webReques { webRequest.setMethod(method()); webRequest.setURL(m_request->url()); - m_headers->forEach(adoptPtrWillBeNoop(new FillWebRequestHeaders(&webRequest))); + m_headers->forEach(new FillWebRequestHeaders(&webRequest)); webRequest.setReferrer(m_request->referrer().referrer().referrer, static_cast<WebReferrerPolicy>(m_request->referrer().referrer().referrerPolicy)); // FIXME: How can we set isReload properly? What is the correct place to load it in to the Request object? We should investigate the right way // to plumb this information in to here. |