| Index: Source/modules/serviceworkers/Response.h
|
| diff --git a/Source/modules/serviceworkers/Response.h b/Source/modules/serviceworkers/Response.h
|
| index 853d33175c73d37a67abec19346f81ef41638fbb..b6e6645e62cb5b3dcff41c4ea111758e524c0115 100644
|
| --- a/Source/modules/serviceworkers/Response.h
|
| +++ b/Source/modules/serviceworkers/Response.h
|
| @@ -12,7 +12,6 @@
|
| #include "modules/serviceworkers/Headers.h"
|
| #include "platform/blob/BlobData.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "wtf/RefCounted.h"
|
| #include "wtf/RefPtr.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -23,23 +22,22 @@ class ExceptionState;
|
| class ResponseInit;
|
| class WebServiceWorkerResponse;
|
|
|
| -class Response FINAL : public RefCountedWillBeGarbageCollected<Response>, public ScriptWrappable {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Response);
|
| +class Response FINAL : public GarbageCollected<Response>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static PassRefPtrWillBeRawPtr<Response> create(Blob*, const Dictionary&, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<Response> create(const String&, const Dictionary&, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<Response> create(Blob*, const ResponseInit&, ExceptionState&);
|
| - static PassRefPtrWillBeRawPtr<Response> create(PassRefPtrWillBeRawPtr<FetchResponseData>);
|
| - static PassRefPtrWillBeRawPtr<Response> create(const WebServiceWorkerResponse&);
|
| + static Response* create(Blob*, const Dictionary&, ExceptionState&);
|
| + static Response* create(const String&, const Dictionary&, ExceptionState&);
|
| + static Response* create(Blob*, const ResponseInit&, ExceptionState&);
|
| + static Response* create(FetchResponseData*);
|
| + static Response* create(const WebServiceWorkerResponse&);
|
|
|
| String type() const;
|
| String url() const;
|
| unsigned short status() const;
|
| String statusText() const;
|
| - PassRefPtrWillBeRawPtr<Headers> headers() const;
|
| + Headers* headers() const;
|
|
|
| - PassRefPtrWillBeRawPtr<FetchBodyStream> body(ExecutionContext*);
|
| + FetchBodyStream* body(ExecutionContext*);
|
|
|
| void populateWebServiceWorkerResponse(WebServiceWorkerResponse&);
|
|
|
| @@ -47,12 +45,12 @@ public:
|
|
|
| private:
|
| Response();
|
| - explicit Response(PassRefPtrWillBeRawPtr<FetchResponseData>);
|
| + explicit Response(FetchResponseData*);
|
| explicit Response(const WebServiceWorkerResponse&);
|
|
|
| - RefPtrWillBeMember<FetchResponseData> m_response;
|
| - RefPtrWillBeMember<Headers> m_headers;
|
| - RefPtrWillBeMember<FetchBodyStream> m_fetchBodyStream;
|
| + Member<FetchResponseData> m_response;
|
| + Member<Headers> m_headers;
|
| + Member<FetchBodyStream> m_fetchBodyStream;
|
| };
|
|
|
| } // namespace blink
|
|
|