Index: Source/modules/serviceworkers/Headers.h |
diff --git a/Source/modules/serviceworkers/Headers.h b/Source/modules/serviceworkers/Headers.h |
index 30d7bcc721accef25a92eccb8932eb92e7704f16..37be593b99a6dd1fc2c1488bc1fa1eeec34276be 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,20 +18,19 @@ 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 { |
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&); |
@@ -60,7 +58,7 @@ private: |
explicit Headers(FetchHeaderList*); |
void forEachInternal(PassOwnPtr<HeadersForEachCallback>, const ScriptValue*); |
- RefPtrWillBeMember<FetchHeaderList> m_headerList; |
+ Member<FetchHeaderList> m_headerList; |
Guard m_guard; |
}; |