| Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
|
| diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
|
| index 32518c964d01bfebfebdfb1bc8c0db19c39cabfc..dfaf9d4aacca3b59659b57fb6fcf739e6588bd24 100644
|
| --- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
|
| +++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
|
| @@ -22,6 +22,7 @@
|
| #ifndef XMLHttpRequest_h
|
| #define XMLHttpRequest_h
|
|
|
| +#include "bindings/core/v8/ActiveScriptWrappable.h"
|
| #include "bindings/core/v8/ScriptString.h"
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "core/dom/ActiveDOMObject.h"
|
| @@ -66,7 +67,7 @@ class XMLHttpRequestUpload;
|
|
|
| typedef int ExceptionCode;
|
|
|
| -class XMLHttpRequest final : public XMLHttpRequestEventTarget, private ThreadableLoaderClient, public DocumentParserClient, public ActiveDOMObject {
|
| +class XMLHttpRequest final : public XMLHttpRequestEventTarget, private ThreadableLoaderClient, public DocumentParserClient, public ActiveScriptWrappable, public ActiveDOMObject {
|
| DEFINE_WRAPPERTYPEINFO();
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(XMLHttpRequest);
|
| public:
|
| @@ -96,11 +97,13 @@ public:
|
| // ActiveDOMObject
|
| void contextDestroyed() override;
|
| ExecutionContext* getExecutionContext() const override;
|
| - bool hasPendingActivity() const override;
|
| void suspend() override;
|
| void resume() override;
|
| void stop() override;
|
|
|
| + // ActiveScriptWrappable
|
| + bool hasPendingActivity() const final;
|
| +
|
| // XMLHttpRequestEventTarget
|
| const AtomicString& interfaceName() const override;
|
|
|
|
|