Index: Source/modules/filesystem/DirectoryReader.h |
diff --git a/Source/modules/filesystem/DirectoryReader.h b/Source/modules/filesystem/DirectoryReader.h |
index c0fff58635e86932c4fe650d0ea7169d20c0fd20..dee58eb733562c3acbcbcd4a2ddf1a23aff564a7 100644 |
--- a/Source/modules/filesystem/DirectoryReader.h |
+++ b/Source/modules/filesystem/DirectoryReader.h |
@@ -32,6 +32,7 @@ |
#define DirectoryReader_h |
#include "bindings/v8/ScriptWrappable.h" |
+#include "heap/Handle.h" |
#include "modules/filesystem/DOMFileSystem.h" |
#include "modules/filesystem/DirectoryReaderBase.h" |
#include "wtf/PassRefPtr.h" |
@@ -46,9 +47,9 @@ class ErrorCallback; |
class DirectoryReader : public DirectoryReaderBase, public ScriptWrappable { |
public: |
- static PassRefPtr<DirectoryReader> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath) |
+ static PassRefPtrWillBeRawPtr<DirectoryReader> create(PassRefPtrWillBeRawPtr<DOMFileSystemBase> fileSystem, const String& fullPath) |
{ |
- return adoptRef(new DirectoryReader(fileSystem, fullPath)); |
+ return adoptRefWillBeNoop(new DirectoryReader(fileSystem, fullPath)); |
} |
virtual ~DirectoryReader(); |
@@ -57,19 +58,21 @@ public: |
DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem.get()); } |
+ virtual void trace(Visitor*) OVERRIDE; |
+ |
private: |
class EntriesCallbackHelper; |
class ErrorCallbackHelper; |
- DirectoryReader(PassRefPtr<DOMFileSystemBase>, const String& fullPath); |
+ DirectoryReader(PassRefPtrWillBeRawPtr<DOMFileSystemBase>, const String& fullPath); |
- void addEntries(const Vector<RefPtr<Entry> >& entries); |
+ void addEntries(const WillBeHeapVector<RefPtrWillBeMember<Entry> >& entries); |
void onError(FileError*); |
bool m_isReading; |
- Vector<RefPtr<Entry> > m_entries; |
- RefPtrWillBePersistent<FileError> m_error; |
+ WillBeHeapVector<RefPtrWillBeMember<Entry> > m_entries; |
+ RefPtrWillBeMember<FileError> m_error; |
OwnPtr<EntriesCallback> m_entriesCallback; |
OwnPtr<ErrorCallback> m_errorCallback; |
}; |