Remove FileError interface

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/filesystem/DirectoryReader.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"
 
 namespace blink {
 
 class DirectoryReader::EntriesCallbackHelper final : public EntriesCallback {
 public:
     explicit EntriesCallbackHelper(DirectoryReader* reader)
         : m_reader(reader)
     {
     }
 
     void handleEvent(const EntryHeapVector& entries) override
     {
         m_reader->addEntries(entries);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_reader);
         EntriesCallback::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;
 };
 
-class DirectoryReader::ErrorCallbackHelper final : public ErrorCallback {
+class DirectoryReader::ErrorCallbackHelper final : public ErrorCallbackBase {
 public:
     explicit ErrorCallbackHelper(DirectoryReader* reader)
         : m_reader(reader)
     {
     }
 
-    void handleEvent(FileError* error) override
+    void handleEvent(FileError::ErrorCode error) override
     {
         m_reader->onError(error);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_reader);
-        ErrorCallback::trace(visitor);
+        ErrorCallbackBase::trace(visitor);
     }
 
 private:
     Member<DirectoryReader> m_reader;
 };
 
 DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem, const String& fullPath)
     : DirectoryReaderBase(fileSystem, fullPath)
     , m_isReading(false)
 {
 }
 
 DirectoryReader::~DirectoryReader()
 {
 }
 
 void DirectoryReader::readEntries(EntriesCallback* entriesCallback, ErrorCallback* errorCallback)
 {
     if (!m_isReading) {
         m_isReading = true;
         filesystem()->readDirectory(this, m_fullPath, new EntriesCallbackHelper(this), new ErrorCallbackHelper(this));
     }
 
     if (m_error) {
-        filesystem()->reportError(errorCallback, m_error.get());
+        filesystem()->reportError(ScriptErrorCallback::wrap(errorCallback), m_error);
         return;
     }
 
     if (m_entriesCallback) {
         // Non-null m_entriesCallback means multiple readEntries() calls are made concurrently. We don't allow doing it.
-        filesystem()->reportError(errorCallback, FileError::create(FileError::INVALID_STATE_ERR));
+        filesystem()->reportError(ScriptErrorCallback::wrap(errorCallback), FileError::INVALID_STATE_ERR);
         return;
     }
 
     if (!m_hasMoreEntries || !m_entries.isEmpty()) {
         if (entriesCallback)
             DOMFileSystem::scheduleCallback(filesystem()->getExecutionContext(), createSameThreadTask(&EntriesCallback::handleEvent, wrapPersistent(entriesCallback), PersistentHeapVector<Member<Entry>>(m_entries)));
         m_entries.clear();
         return;
     }
 
     m_entriesCallback = entriesCallback;
     m_errorCallback = errorCallback;
 }
 
 void DirectoryReader::addEntries(const EntryHeapVector& entries)
 {
     m_entries.appendVector(entries);
     m_errorCallback = nullptr;
     if (m_entriesCallback) {
         EntriesCallback* entriesCallback = m_entriesCallback.release();
         EntryHeapVector entries;
         entries.swap(m_entries);
         entriesCallback->handleEvent(entries);
     }
 }
 
-void DirectoryReader::onError(FileError* error)
+void DirectoryReader::onError(FileError::ErrorCode error)
 {
     m_error = error;
     m_entriesCallback = nullptr;
     if (m_errorCallback) {
-        ErrorCallback* errorCallback = m_errorCallback.release();
+        // TODO(jsbell): Just call m_errorCallback->handleEvent(FileError::createDOMException(error)) directly?

[foolip, 2016/07/12 12:42:53]

Is that blocked on some additional refactoring?

[jsbell, 2016/07/12 17:43:51]

Ah yes, I meant to ask for opinions. I'm waffling over which approach to take -
(1) keep a single place that calls handleEvent() or (2) eliminate the temp
wrapper. I'll go with #2 (i.e. make the change) but feedback welcome!

[foolip, 2016/07/13 14:39:17]

This looks good, an extra wrapper just to avoid the characters "handleEvent"
seems like too much purity even for me :)

+        ErrorCallbackBase* errorCallback = ScriptErrorCallback::wrap(m_errorCallback.release());
         errorCallback->handleEvent(error);
     }
 }
 
 DEFINE_TRACE(DirectoryReader)
 {
     visitor->trace(m_entries);
-    visitor->trace(m_error);
     visitor->trace(m_entriesCallback);
     visitor->trace(m_errorCallback);
     DirectoryReaderBase::trace(visitor);
 }
 
 } // namespace blink