| Index: third_party/WebKit/Source/core/fileapi/FileReader.h
|
| diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.h b/third_party/WebKit/Source/core/fileapi/FileReader.h
|
| index e871ecb6571667dde2855584c9f05f38a9e25f87..351f7feea782977ce337dd9ad0730399c4ff07f8 100644
|
| --- a/third_party/WebKit/Source/core/fileapi/FileReader.h
|
| +++ b/third_party/WebKit/Source/core/fileapi/FileReader.h
|
| @@ -31,6 +31,7 @@
|
| #ifndef FileReader_h
|
| #define FileReader_h
|
|
|
| +#include "bindings/core/v8/ActiveScriptWrappable.h"
|
| #include "core/CoreExport.h"
|
| #include "core/dom/ActiveDOMObject.h"
|
| #include "core/events/EventTarget.h"
|
| @@ -49,7 +50,7 @@ class ExceptionState;
|
| class ExecutionContext;
|
| class StringOrArrayBuffer;
|
|
|
| -class CORE_EXPORT FileReader final : public RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>, public ActiveDOMObject, public FileReaderLoaderClient {
|
| +class CORE_EXPORT FileReader final : public RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>, public ActiveScriptWrappable, public ActiveDOMObject, public FileReaderLoaderClient {
|
| DEFINE_WRAPPERTYPEINFO();
|
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(FileReader);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader);
|
| @@ -79,7 +80,9 @@ public:
|
|
|
| // ActiveDOMObject
|
| void stop() override;
|
| - bool hasPendingActivity() const override;
|
| +
|
| + // ActiveScriptWrappable
|
| + bool hasPendingActivity() const final;
|
|
|
| // EventTarget
|
| const AtomicString& interfaceName() const override;
|
|
|