| Index: Source/modules/fetch/Request.h
|
| diff --git a/Source/modules/fetch/Request.h b/Source/modules/fetch/Request.h
|
| index ed92fbad9a827de56b232f57568b7502b347b14a..33ecbb0870880f83f99ca839c0d26b37e8546ed0 100644
|
| --- a/Source/modules/fetch/Request.h
|
| +++ b/Source/modules/fetch/Request.h
|
| @@ -15,7 +15,6 @@
|
| #include "platform/heap/Handle.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "public/platform/WebURLRequest.h"
|
| -#include "wtf/RefPtr.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
| @@ -24,12 +23,13 @@ class BodyStreamBuffer;
|
| class RequestInit;
|
| class WebServiceWorkerRequest;
|
|
|
| -typedef RequestOrUSVString RequestInfo;
|
| +using RequestInfo = RequestOrUSVString;
|
|
|
| class MODULES_EXPORT Request final : public Body {
|
| DEFINE_WRAPPERTYPEINFO();
|
| + WTF_MAKE_NONCOPYABLE(Request);
|
| public:
|
| - ~Request() override { }
|
| + ~Request() override {}
|
|
|
| // From Request.idl:
|
| static Request* create(ScriptState*, const RequestInfo&, const Dictionary&, ExceptionState&);
|
| @@ -41,8 +41,6 @@ public:
|
| static Request* create(ExecutionContext*, FetchRequestData*);
|
| static Request* create(ExecutionContext*, const WebServiceWorkerRequest&);
|
|
|
| - const FetchRequestData* request() { return m_request; }
|
| -
|
| // From Request.idl:
|
| String method() const;
|
| KURL url() const;
|
| @@ -56,10 +54,10 @@ public:
|
| Request* clone(ExceptionState&);
|
|
|
| FetchRequestData* passRequestData();
|
| -
|
| void populateWebServiceWorkerRequest(WebServiceWorkerRequest&) const;
|
| -
|
| - bool hasBody() const { return m_request->buffer(); }
|
| + bool hasBody() const;
|
| + BodyStreamBuffer* bodyBuffer() override { return m_request->buffer(); }
|
| + const BodyStreamBuffer* bodyBuffer() const override { return m_request->buffer(); }
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -68,11 +66,8 @@ private:
|
| Request(ExecutionContext*, const WebServiceWorkerRequest&);
|
| Request(ExecutionContext*, FetchRequestData*, Headers*);
|
|
|
| - void setBuffer(BodyStreamBuffer*);
|
| - void refreshBody();
|
| -
|
| + const FetchRequestData* request() const { return m_request; }
|
| static Request* createRequestWithRequestOrString(ScriptState*, Request*, const String&, const RequestInit&, ExceptionState&);
|
| - void clearHeaderList();
|
|
|
| String mimeType() const override;
|
|
|
|
|