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

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

Issue 176853004: Oilpan: move core/fileapi to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 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
« no previous file with comments | « Source/core/fileapi/FileList.idl ('k') | Source/core/fileapi/FileReader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fileapi/FileReader.h
diff --git a/Source/core/fileapi/FileReader.h b/Source/core/fileapi/FileReader.h
index c0ec2e600497b9a5dfd1310abcd639723532d820..8cb5d3c3ece807cbc28b8efef7d7cffb902ea0da 100644
--- a/Source/core/fileapi/FileReader.h
+++ b/Source/core/fileapi/FileReader.h
@@ -37,6 +37,7 @@
#include "core/fileapi/FileError.h"
#include "core/fileapi/FileReaderLoader.h"
#include "core/fileapi/FileReaderLoaderClient.h"
+#include "heap/Handle.h"
#include "wtf/Forward.h"
#include "wtf/RefCounted.h"
#include "wtf/ThreadSpecific.h"
@@ -48,10 +49,10 @@ class Blob;
class ExceptionState;
class ExecutionContext;
-class FileReader FINAL : public RefCounted<FileReader>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
- REFCOUNTED_EVENT_TARGET(FileReader);
+class FileReader FINAL : public RefCountedWillBeRefCountedGarbageCollected<FileReader>, public ScriptWrappable, public ActiveDOMObject, public FileReaderLoaderClient, public EventTargetWithInlineData {
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<FileReader>);
public:
- static PassRefPtr<FileReader> create(ExecutionContext*);
+ static PassRefPtrWillBeRawPtr<FileReader> create(ExecutionContext*);
virtual ~FileReader();
@@ -71,7 +72,7 @@ public:
void doAbort();
ReadyState readyState() const { return m_state; }
- PassRefPtr<FileError> error() { return m_error; }
+ PassRefPtrWillBeRawPtr<FileError> error() { return m_error; }
FileReaderLoader::ReadType readType() const { return m_readType; }
PassRefPtr<ArrayBuffer> arrayBufferResult() const;
String stringResult();
@@ -96,6 +97,8 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
+ void trace(Visitor*);
+
private:
class ThrottlingController;
@@ -127,7 +130,7 @@ private:
String m_encoding;
OwnPtr<FileReaderLoader> m_loader;
- RefPtr<FileError> m_error;
+ RefPtrWillBeMember<FileError> m_error;
double m_lastProgressNotificationTimeMS;
};
« no previous file with comments | « Source/core/fileapi/FileList.idl ('k') | Source/core/fileapi/FileReader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698