Index: Source/modules/serviceworkers/Request.h |
diff --git a/Source/modules/serviceworkers/Request.h b/Source/modules/serviceworkers/Request.h |
index 9c34d97882e3e80cc3c1ac2c97e7f7d676303181..e54eb6433e538b6e7658bd29efd0ba8ea9db920b 100644 |
--- a/Source/modules/serviceworkers/Request.h |
+++ b/Source/modules/serviceworkers/Request.h |
@@ -11,7 +11,6 @@ |
#include "modules/serviceworkers/Headers.h" |
#include "platform/heap/Handle.h" |
#include "platform/weborigin/KURL.h" |
-#include "wtf/RefCounted.h" |
#include "wtf/RefPtr.h" |
#include "wtf/text/WTFString.h" |
@@ -23,23 +22,22 @@ struct ResourceLoaderOptions; |
struct ThreadableLoaderOptions; |
class WebServiceWorkerRequest; |
-class Request FINAL : public RefCountedWillBeGarbageCollected<Request>, public ScriptWrappable { |
- DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Request); |
+class Request FINAL : public GarbageCollected<Request>, public ScriptWrappable { |
public: |
- static PassRefPtrWillBeRawPtr<Request> create(ExecutionContext*, const String&, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Request> create(ExecutionContext*, const String&, const Dictionary&, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Request> create(ExecutionContext*, Request*, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Request> create(ExecutionContext*, Request*, const Dictionary&, ExceptionState&); |
+ static Request* create(ExecutionContext*, const String&, ExceptionState&); |
+ static Request* create(ExecutionContext*, const String&, const Dictionary&, ExceptionState&); |
+ static Request* create(ExecutionContext*, Request*, ExceptionState&); |
+ static Request* create(ExecutionContext*, Request*, const Dictionary&, ExceptionState&); |
- static PassRefPtrWillBeRawPtr<Request> create(PassRefPtrWillBeRawPtr<FetchRequestData>); |
+ static Request* create(FetchRequestData*); |
- static PassRefPtrWillBeRawPtr<Request> create(const WebServiceWorkerRequest&); |
+ static Request* create(const WebServiceWorkerRequest&); |
- PassRefPtrWillBeRawPtr<FetchRequestData> request() { return m_request; } |
+ FetchRequestData* request() { return m_request; } |
String method() const; |
String url() const; |
- PassRefPtrWillBeRawPtr<Headers> headers() const { return m_headers; } |
+ Headers* headers() const { return m_headers; } |
// FIXME: Support body. |
String referrer() const; |
String mode() const; |
@@ -48,11 +46,11 @@ public: |
void trace(Visitor*); |
private: |
- explicit Request(PassRefPtrWillBeRawPtr<FetchRequestData>); |
+ explicit Request(FetchRequestData*); |
explicit Request(const WebServiceWorkerRequest&); |
- RefPtrWillBeMember<FetchRequestData> m_request; |
- RefPtrWillBeMember<Headers> m_headers; |
+ Member<FetchRequestData> m_request; |
+ Member<Headers> m_headers; |
}; |
} // namespace blink |