Index: Source/modules/serviceworkers/Request.h |
diff --git a/Source/modules/serviceworkers/Request.h b/Source/modules/serviceworkers/Request.h |
index 601f031a1700a315472f8ffb4571e623dde2ff26..2194f88b7e049aa04b5426eeb13a78c23c431c97 100644 |
--- a/Source/modules/serviceworkers/Request.h |
+++ b/Source/modules/serviceworkers/Request.h |
@@ -9,6 +9,7 @@ |
#include "bindings/core/v8/ScriptWrappable.h" |
#include "modules/serviceworkers/FetchRequestData.h" |
#include "modules/serviceworkers/Headers.h" |
+#include "platform/heap/Handle.h" |
#include "platform/weborigin/KURL.h" |
#include "wtf/RefCounted.h" |
#include "wtf/RefPtr.h" |
@@ -18,29 +19,28 @@ namespace blink { class WebServiceWorkerRequest; } |
namespace WebCore { |
-struct RequestInit; |
+class RequestInit; |
class ResourceRequest; |
struct ResourceLoaderOptions; |
struct ThreadableLoaderOptions; |
-class Request FINAL : public RefCounted<Request>, public ScriptWrappable { |
+class Request FINAL : public RefCountedWillBeGarbageCollected<Request>, public ScriptWrappable { |
+ DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Request); |
public: |
- static PassRefPtr<Request> create(ExecutionContext*, const String&, ExceptionState&); |
- static PassRefPtr<Request> create(ExecutionContext*, const String&, const Dictionary&, ExceptionState&); |
- static PassRefPtr<Request> create(ExecutionContext*, Request*, ExceptionState&); |
- static PassRefPtr<Request> create(ExecutionContext*, Request*, const Dictionary&, ExceptionState&); |
+ 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 PassRefPtr<Request> create(PassRefPtr<FetchRequestData>); |
+ static PassRefPtrWillBeRawPtr<Request> create(PassRefPtrWillBeRawPtr<FetchRequestData>); |
- static PassRefPtr<Request> create(const blink::WebServiceWorkerRequest&); |
+ static PassRefPtrWillBeRawPtr<Request> create(const blink::WebServiceWorkerRequest&); |
- ~Request() { }; |
- |
- PassRefPtr<FetchRequestData> request() { return m_request; } |
+ PassRefPtrWillBeRawPtr<FetchRequestData> request() { return m_request; } |
String method() const; |
String url() const; |
- PassRefPtr<Headers> headers() const { return m_headers; } |
+ PassRefPtrWillBeRawPtr<Headers> headers() const { return m_headers; } |
// FIXME: Support body. |
String referrer() const; |
String mode() const; |
@@ -48,12 +48,14 @@ public: |
PassOwnPtr<ResourceRequest> createResourceRequest() const; |
+ void trace(Visitor*); |
+ |
private: |
- explicit Request(PassRefPtr<FetchRequestData>); |
+ explicit Request(PassRefPtrWillBeRawPtr<FetchRequestData>); |
explicit Request(const blink::WebServiceWorkerRequest&); |
- RefPtr<FetchRequestData> m_request; |
- RefPtr<Headers> m_headers; |
+ RefPtrWillBeMember<FetchRequestData> m_request; |
+ RefPtrWillBeMember<Headers> m_headers; |
}; |
} // namespace WebCore |