| Index: third_party/WebKit/Source/core/fileapi/FileReader.cpp
|
| diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.cpp b/third_party/WebKit/Source/core/fileapi/FileReader.cpp
|
| index c4ad7b6ea34eeaf00e94bc9863d18db8ecc3d4d1..b654c90a608f498e3a9e91a6ef20ea5678c97c4a 100644
|
| --- a/third_party/WebKit/Source/core/fileapi/FileReader.cpp
|
| +++ b/third_party/WebKit/Source/core/fileapi/FileReader.cpp
|
| @@ -196,13 +196,11 @@ private:
|
|
|
| FileReader* FileReader::create(ExecutionContext* context)
|
| {
|
| - FileReader* fileReader = new FileReader(context);
|
| - fileReader->suspendIfNeeded();
|
| - return fileReader;
|
| + return new FileReader(context);
|
| }
|
|
|
| FileReader::FileReader(ExecutionContext* context)
|
| - : ActiveDOMObject(context)
|
| + : ContextLifecycleObserver(context)
|
| , m_state(EMPTY)
|
| , m_loadingState(LoadingStateNone)
|
| , m_readType(FileReaderLoader::ReadAsBinaryString)
|
| @@ -221,7 +219,7 @@ const AtomicString& FileReader::interfaceName() const
|
| return EventTargetNames::FileReader;
|
| }
|
|
|
| -void FileReader::stop()
|
| +void FileReader::contextDestroyed()
|
| {
|
| // The delayed abort task tidies up and advances to the DONE state.
|
| if (m_loadingState == LoadingStateAborted)
|
| @@ -471,7 +469,7 @@ DEFINE_TRACE(FileReader)
|
| {
|
| visitor->trace(m_error);
|
| RefCountedGarbageCollectedEventTargetWithInlineData<FileReader>::trace(visitor);
|
| - ActiveDOMObject::trace(visitor);
|
| + ContextLifecycleObserver::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|