Index: Source/modules/serviceworkers/FetchRequestData.h |
diff --git a/Source/modules/serviceworkers/FetchRequestData.h b/Source/modules/serviceworkers/FetchRequestData.h |
index 7b202177d0e4425795e05c5301316213acd871cf..e95252b5e280fe8e5b31903b3cd3f069d441eabe 100644 |
--- a/Source/modules/serviceworkers/FetchRequestData.h |
+++ b/Source/modules/serviceworkers/FetchRequestData.h |
@@ -10,7 +10,6 @@ |
#include "platform/weborigin/Referrer.h" |
#include "wtf/PassOwnPtr.h" |
#include "wtf/PassRefPtr.h" |
-#include "wtf/RefCounted.h" |
#include "wtf/text/AtomicString.h" |
#include "wtf/text/WTFString.h" |
@@ -27,7 +26,7 @@ class ResourceRequest; |
class SecurityOrigin; |
struct ThreadableLoaderOptions; |
-class FetchRequestData FINAL : public RefCountedWillBeGarbageCollectedFinalized<FetchRequestData> { |
+class FetchRequestData FINAL : public GarbageCollectedFinalized<FetchRequestData> { |
WTF_MAKE_NONCOPYABLE(FetchRequestData); |
public: |
enum Mode { SameOriginMode, NoCORSMode, CORSMode, CORSWithForcedPreflight }; |
@@ -64,10 +63,10 @@ public: |
blink::Referrer m_referrer; |
}; |
- static PassRefPtrWillBeRawPtr<FetchRequestData> create(ExecutionContext*); |
- static PassRefPtrWillBeRawPtr<FetchRequestData> create(const blink::WebServiceWorkerRequest&); |
- PassRefPtrWillBeRawPtr<FetchRequestData> createRestrictedCopy(ExecutionContext*, PassRefPtr<SecurityOrigin>) const; |
- PassRefPtrWillBeRawPtr<FetchRequestData> createCopy() const; |
+ static FetchRequestData* create(ExecutionContext*); |
+ static FetchRequestData* create(const blink::WebServiceWorkerRequest&); |
+ FetchRequestData* createRestrictedCopy(ExecutionContext*, PassRefPtr<SecurityOrigin>) const; |
+ FetchRequestData* createCopy() const; |
~FetchRequestData(); |
void setMethod(AtomicString method) { m_method = method; } |
@@ -91,11 +90,11 @@ public: |
private: |
FetchRequestData(); |
- static PassRefPtrWillBeRawPtr<FetchRequestData> create(); |
+ static FetchRequestData* create(); |
AtomicString m_method; |
KURL m_url; |
- RefPtrWillBeMember<FetchHeaderList> m_headerList; |
+ Member<FetchHeaderList> m_headerList; |
bool m_unsafeRequestFlag; |
// FIXME: Support body. |
// FIXME: Support m_skipServiceWorkerFlag; |