Index: third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp |
diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp b/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp |
index 8143c8d2eec64d1e5ee12a7ff4b6774cb4090853..6b040367f9f587c8513a236e62e1ab9031b82462 100644 |
--- a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp |
+++ b/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp |
@@ -67,7 +67,12 @@ public: |
{ |
} |
- void handleEvent(FileError* error) override |
+ void handleEvent(DOMException* error) override |
+ { |
+ NOTREACHED(); |
+ } |
+ |
+ void handleEvent(FileError::ErrorCode error) override |
{ |
m_reader->onError(error); |
} |
@@ -106,7 +111,7 @@ void DirectoryReader::readEntries(EntriesCallback* entriesCallback, ErrorCallbac |
if (m_entriesCallback) { |
// Non-null m_entriesCallback means multiple readEntries() calls are made concurrently. We don't allow doing it. |
- filesystem()->scheduleCallback(errorCallback, FileError::create(FileError::INVALID_STATE_ERR)); |
+ filesystem()->scheduleCallback(errorCallback, FileError::INVALID_STATE_ERR); |
return; |
} |
@@ -132,7 +137,7 @@ void DirectoryReader::addEntries(const EntryHeapVector& entries) |
} |
} |
-void DirectoryReader::onError(FileError* error) |
+void DirectoryReader::onError(FileError::ErrorCode error) |
{ |
m_error = error; |
m_entriesCallback = nullptr; |
@@ -145,7 +150,6 @@ void DirectoryReader::onError(FileError* error) |
DEFINE_TRACE(DirectoryReader) |
{ |
visitor->trace(m_entries); |
- visitor->trace(m_error); |
visitor->trace(m_entriesCallback); |
visitor->trace(m_errorCallback); |
DirectoryReaderBase::trace(visitor); |