| Index: third_party/WebKit/Source/modules/fetch/Response.h
|
| diff --git a/third_party/WebKit/Source/modules/fetch/Response.h b/third_party/WebKit/Source/modules/fetch/Response.h
|
| index b7433d54f6049887536e49fb8f3a3ace65a4da43..e3335d53bbe63592588117ed9fc981b2abd4cb53 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/Response.h
|
| +++ b/third_party/WebKit/Source/modules/fetch/Response.h
|
| @@ -6,6 +6,7 @@
|
| #define Response_h
|
|
|
| #include "bindings/core/v8/Dictionary.h"
|
| +#include "bindings/core/v8/ScriptValue.h"
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "bindings/modules/v8/UnionTypesModules.h"
|
| #include "modules/ModulesExport.h"
|
| @@ -24,10 +25,9 @@ class DOMArrayBuffer;
|
| class ExceptionState;
|
| class FetchDataConsumerHandle;
|
| class ResponseInit;
|
| +class ScriptState;
|
| class WebServiceWorkerResponse;
|
|
|
| -typedef BlobOrArrayBufferOrArrayBufferViewOrFormDataOrUSVString BodyInit;
|
| -
|
| class MODULES_EXPORT Response final : public Body {
|
| DEFINE_WRAPPERTYPEINFO();
|
| WTF_MAKE_NONCOPYABLE(Response);
|
| @@ -35,8 +35,8 @@ public:
|
| ~Response() override { }
|
|
|
| // From Response.idl:
|
| - static Response* create(ExecutionContext*, ExceptionState&);
|
| - static Response* create(ExecutionContext*, const BodyInit&, const Dictionary&, ExceptionState&);
|
| + static Response* create(ScriptState*, ExceptionState&);
|
| + static Response* create(ScriptState*, ScriptValue body, const Dictionary&, ExceptionState&);
|
|
|
| static Response* create(ExecutionContext*, PassOwnPtr<FetchDataConsumerHandle> bodyHandle, const String& contentType, const ResponseInit&, ExceptionState&);
|
| static Response* create(ExecutionContext*, FetchResponseData*);
|
| @@ -62,6 +62,7 @@ public:
|
|
|
| // ActiveDOMObject
|
| bool hasPendingActivity() const override;
|
| + void stop() override;
|
|
|
| // Does not call response.setBlobDataHandle().
|
| void populateWebServiceWorkerResponse(WebServiceWorkerResponse& /* response */);
|
|
|