| Index: Source/modules/serviceworkers/Headers.h
|
| diff --git a/Source/modules/serviceworkers/Headers.h b/Source/modules/serviceworkers/Headers.h
|
| index 476899725d3a22a075ae74392807e1ebc95a7d40..7234dc82309d613f5c40b0915a31538f28b04341 100644
|
| --- a/Source/modules/serviceworkers/Headers.h
|
| +++ b/Source/modules/serviceworkers/Headers.h
|
| @@ -9,7 +9,6 @@
|
| #include "modules/serviceworkers/FetchHeaderList.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/PassOwnPtr.h"
|
| -#include "wtf/RefCounted.h"
|
|
|
| namespace blink {
|
|
|
| @@ -19,21 +18,20 @@ class HeadersForEachCallback;
|
| class ScriptValue;
|
|
|
| // http://fetch.spec.whatwg.org/#headers-class
|
| -class Headers FINAL : public RefCountedWillBeGarbageCollected<Headers>, public ScriptWrappable {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Headers);
|
| +class Headers FINAL : public GarbageCollected<Headers>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| enum Guard { ImmutableGuard, RequestGuard, RequestNoCORSGuard, ResponseGuard, NoneGuard };
|
|
|
| - static PassRefPtrWillBeRawPtr<Headers> create();
|
| - static PassRefPtrWillBeRawPtr<Headers> create(ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<Headers> create(const Headers*, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<Headers> create(const Dictionary&, ExceptionState&);
|
| + static Headers* create();
|
| + static Headers* create(ExceptionState&);
|
| + static Headers* create(const Headers*, ExceptionState&);
|
| + static Headers* create(const Dictionary&, ExceptionState&);
|
|
|
| // Shares the FetchHeaderList. Called when creating a Request or Response.
|
| - static PassRefPtrWillBeRawPtr<Headers> create(FetchHeaderList*);
|
| + static Headers* create(FetchHeaderList*);
|
|
|
| - PassRefPtrWillBeRawPtr<Headers> createCopy() const;
|
| + Headers* createCopy() const;
|
|
|
| // Headers.idl implementation.
|
| void append(const String& name, const String& value, ExceptionState&);
|
| @@ -61,7 +59,7 @@ private:
|
| explicit Headers(FetchHeaderList*);
|
| void forEachInternal(PassOwnPtrWillBeRawPtr<HeadersForEachCallback>, const ScriptValue*);
|
|
|
| - RefPtrWillBeMember<FetchHeaderList> m_headerList;
|
| + Member<FetchHeaderList> m_headerList;
|
| Guard m_guard;
|
| };
|
|
|
|
|