Web expose FileSystemFileEntry, FileSystemDirectoryEntry and friends

third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.cpp

Index: third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.cpp
similarity index 67%
rename from third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
rename to third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.cpp
index 06408f27b174a07689dc2e40c7fb19f7fcd73b8f..0b7f265ab648d387e7a4ab6792fb9e4f7e6aced4 100644
--- a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.cpp
@@ -28,19 +28,21 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "modules/filesystem/DirectoryReader.h"
+#include "modules/filesystem/FileSystemDirectoryReader.h"
 
 #include "core/fileapi/FileError.h"
-#include "modules/filesystem/EntriesCallback.h"
-#include "modules/filesystem/Entry.h"
 #include "modules/filesystem/ErrorCallback.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
+#include "modules/filesystem/FileSystemEntriesCallback.h"
+#include "modules/filesystem/FileSystemEntry.h"
 
 namespace blink {
 
-class DirectoryReader::EntriesCallbackHelper final : public EntriesCallback {
+class FileSystemDirectoryReader::EntriesCallbackHelper final
+    : public FileSystemEntriesCallback {
  public:
-  explicit EntriesCallbackHelper(DirectoryReader* reader) : m_reader(reader) {}
+  explicit EntriesCallbackHelper(FileSystemDirectoryReader* reader)
+      : m_reader(reader) {}
 
   void handleEvent(const EntryHeapVector& entries) override {
     m_reader->addEntries(entries);
@@ -48,18 +50,20 @@ class DirectoryReader::EntriesCallbackHelper final : public EntriesCallback {
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_reader);
-    EntriesCallback::trace(visitor);
+    FileSystemEntriesCallback::trace(visitor);
   }
 
  private:
   // FIXME: This Member keeps the reader alive until all of the readDirectory
   // results are received. crbug.com/350285
-  Member<DirectoryReader> m_reader;
+  Member<FileSystemDirectoryReader> m_reader;
 };
 
-class DirectoryReader::ErrorCallbackHelper final : public ErrorCallbackBase {
+class FileSystemDirectoryReader::ErrorCallbackHelper final
+    : public ErrorCallbackBase {
  public:
-  explicit ErrorCallbackHelper(DirectoryReader* reader) : m_reader(reader) {}
+  explicit ErrorCallbackHelper(FileSystemDirectoryReader* reader)
+      : m_reader(reader) {}
 
   void invoke(FileError::ErrorCode error) override { m_reader->onError(error); }
 
@@ -69,17 +73,18 @@ class DirectoryReader::ErrorCallbackHelper final : public ErrorCallbackBase {
   }
 
  private:
-  Member<DirectoryReader> m_reader;
+  Member<FileSystemDirectoryReader> m_reader;
 };
 
-DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem,
-                                 const String& fullPath)
-    : DirectoryReaderBase(fileSystem, fullPath), m_isReading(false) {}
+FileSystemDirectoryReader::FileSystemDirectoryReader(FileSystemBase* fileSystem,
+                                                     const String& fullPath)
+    : FileSystemDirectoryReaderBase(fileSystem, fullPath), m_isReading(false) {}
 
-DirectoryReader::~DirectoryReader() {}
+FileSystemDirectoryReader::~FileSystemDirectoryReader() {}
 
-void DirectoryReader::readEntries(EntriesCallback* entriesCallback,
-                                  ErrorCallback* errorCallback) {
+void FileSystemDirectoryReader::readEntries(
+    FileSystemEntriesCallback* entriesCallback,
+    ErrorCallback* errorCallback) {
   if (!m_isReading) {
     m_isReading = true;
     filesystem()->readDirectory(this, m_fullPath,
@@ -102,12 +107,14 @@ void DirectoryReader::readEntries(EntriesCallback* entriesCallback,
   }
 
   if (!m_hasMoreEntries || !m_entries.isEmpty()) {
-    if (entriesCallback)
-      DOMFileSystem::scheduleCallback(
+    if (entriesCallback) {
+      FileSystem::scheduleCallback(
           filesystem()->getExecutionContext(),
-          createSameThreadTask(&EntriesCallback::handleEvent,
-                               wrapPersistent(entriesCallback),
-                               PersistentHeapVector<Member<Entry>>(m_entries)));
+          createSameThreadTask(
+              &FileSystemEntriesCallback::handleEvent,
+              wrapPersistent(entriesCallback),
+              PersistentHeapVector<Member<FileSystemEntry>>(m_entries)));
+    }
     m_entries.clear();
     return;
   }
@@ -116,29 +123,29 @@ void DirectoryReader::readEntries(EntriesCallback* entriesCallback,
   m_errorCallback = errorCallback;
 }
 
-void DirectoryReader::addEntries(const EntryHeapVector& entries) {
+void FileSystemDirectoryReader::addEntries(const EntryHeapVector& entries) {
   m_entries.appendVector(entries);
   m_errorCallback = nullptr;
   if (m_entriesCallback) {
-    EntriesCallback* entriesCallback = m_entriesCallback.release();
+    FileSystemEntriesCallback* entriesCallback = m_entriesCallback.release();
     EntryHeapVector entries;
     entries.swap(m_entries);
     entriesCallback->handleEvent(entries);
   }
 }
 
-void DirectoryReader::onError(FileError::ErrorCode error) {
+void FileSystemDirectoryReader::onError(FileError::ErrorCode error) {
   m_error = error;
   m_entriesCallback = nullptr;
   if (m_errorCallback)
     m_errorCallback->handleEvent(FileError::createDOMException(error));
 }
 
-DEFINE_TRACE(DirectoryReader) {
+DEFINE_TRACE(FileSystemDirectoryReader) {
   visitor->trace(m_entries);
   visitor->trace(m_entriesCallback);
   visitor->trace(m_errorCallback);
-  DirectoryReaderBase::trace(visitor);
+  FileSystemDirectoryReaderBase::trace(visitor);
 }
 
 }  // namespace blink