| Index: Source/modules/filesystem/InspectorFileSystemAgent.cpp
|
| diff --git a/Source/modules/filesystem/InspectorFileSystemAgent.cpp b/Source/modules/filesystem/InspectorFileSystemAgent.cpp
|
| index 2b60ead307615afee60f723c159b378efbc0ff51..bd6247093e6a75beef7a77f7f5921d14ec7658ec 100644
|
| --- a/Source/modules/filesystem/InspectorFileSystemAgent.cpp
|
| +++ b/Source/modules/filesystem/InspectorFileSystemAgent.cpp
|
| @@ -201,7 +201,7 @@ private:
|
| }
|
|
|
| bool didGetEntry(Entry*);
|
| - bool didReadDirectoryEntries(const EntryVector&);
|
| + bool didReadDirectoryEntries(const EntryHeapVector&);
|
|
|
| void reportResult(FileError::ErrorCode errorCode, PassRefPtr<Array<TypeBuilder::FileSystem::Entry> > entries = nullptr)
|
| {
|
| @@ -217,7 +217,7 @@ private:
|
| RefPtr<RequestDirectoryContentCallback> m_requestCallback;
|
| KURL m_url;
|
| RefPtr<Array<TypeBuilder::FileSystem::Entry> > m_entries;
|
| - RefPtr<DirectoryReader> m_directoryReader;
|
| + RefPtrWillBePersistent<DirectoryReader> m_directoryReader;
|
| };
|
|
|
| void DirectoryContentRequest::start(ExecutionContext* executionContext)
|
| @@ -257,7 +257,7 @@ void DirectoryContentRequest::readDirectoryEntries()
|
| m_directoryReader->readEntries(successCallback.release(), errorCallback.release());
|
| }
|
|
|
| -bool DirectoryContentRequest::didReadDirectoryEntries(const EntryVector& entries)
|
| +bool DirectoryContentRequest::didReadDirectoryEntries(const EntryHeapVector& entries)
|
| {
|
| if (entries.isEmpty()) {
|
| reportResult(static_cast<FileError::ErrorCode>(0), m_entries);
|
| @@ -265,7 +265,7 @@ bool DirectoryContentRequest::didReadDirectoryEntries(const EntryVector& entries
|
| }
|
|
|
| for (size_t i = 0; i < entries.size(); ++i) {
|
| - RefPtr<Entry> entry = entries[i];
|
| + RefPtrWillBeRawPtr<Entry> entry = entries[i];
|
| RefPtr<TypeBuilder::FileSystem::Entry> entryForFrontend = TypeBuilder::FileSystem::Entry::create()
|
| .setUrl(entry->toURL())
|
| .setName(entry->name())
|
| @@ -433,7 +433,7 @@ private:
|
| String m_mimeType;
|
| String m_charset;
|
|
|
| - RefPtr<FileReader> m_reader;
|
| + RefPtrWillBePersistent<FileReader> m_reader;
|
| };
|
|
|
| void FileContentRequest::start(ExecutionContext* executionContext)
|
|
|