Reduce ActiveDOMObjects from core/

third_party/WebKit/Source/core/fileapi/FileReader.h

 /*
  * Copyright (C) 2010 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FileReader_h
 #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"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class Blob;
 class DOMArrayBuffer;
 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);
 public:
     static FileReader* create(ExecutionContext*);
 
     ~FileReader() override;
 
     enum ReadyState {
         EMPTY = 0,
         LOADING = 1,
         DONE = 2
     };
 
     void readAsArrayBuffer(Blob*, ExceptionState&);
     void readAsBinaryString(Blob*, ExceptionState&);
     void readAsText(Blob*, const String& encoding, ExceptionState&);
     void readAsText(Blob*, ExceptionState&);
     void readAsDataURL(Blob*, ExceptionState&);
     void abort();
 
     void doAbort();
 
     ReadyState getReadyState() const { return m_state; }
     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;
     void didReceiveData() override;
     void didFinishLoading() override;
     void didFail(FileError::ErrorCode) override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
@@ skipping 33 matching lines @@
 
     OwnPtr<FileReaderLoader> m_loader;
     Member<FileError> m_error;
     double m_lastProgressNotificationTimeMS;
     int m_asyncOperationId;
 };
 
 } // namespace blink
 
 #endif // FileReader_h