Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Unified Diff: third_party/WebKit/Source/core/fileapi/FileReader.h

Issue 1750453002: Reduce ActiveDOMObjects from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0fef1786c4f010c03e50e31241de0d22ce257808..0f6b262af05fd77fccb9617bea1dfa086f8c8825 100644
--- a/third_party/WebKit/Source/core/fileapi/FileReader.h
+++ b/third_party/WebKit/Source/core/fileapi/FileReader.h
@@ -32,7 +32,7 @@
#define FileReader_h
#include "core/CoreExport.h"
-#include "core/dom/ActiveDOMObject.h"
+#include "core/dom/ContextLifecycleObserver.h"
#include "core/events/EventTarget.h"
#include "core/fileapi/FileError.h"
#include "core/fileapi/FileReaderLoader.h"
@@ -49,7 +49,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 ContextLifecycleObserver, public FileReaderLoaderClient {
DEFINE_WRAPPERTYPEINFO();
REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(FileReader);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader);
@@ -77,13 +77,12 @@ public:
FileError* error() { return m_error; }
void result(StringOrArrayBuffer& resultAttribute) const;
- // ActiveDOMObject
- void stop() override;
+ void contextDestroyed() override;
bool hasPendingActivity() const override;
// EventTarget
const AtomicString& interfaceName() const override;
- ExecutionContext* executionContext() const override { return ActiveDOMObject::executionContext(); }
+ ExecutionContext* executionContext() const override { return ContextLifecycleObserver::executionContext(); }
// FileReaderLoaderClient
void didStartLoading() override;

Powered by Google App Engine
This is Rietveld 408576698