Handle has_more correctly

Source/modules/filesystem/DirectoryReaderSync.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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/filesystem/DirectoryReaderSync.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/filesystem/DirectoryEntry.h"
 #include "modules/filesystem/DirectoryEntrySync.h"
+#include "modules/filesystem/EntriesCallback.h"
 #include "modules/filesystem/EntrySync.h"
+#include "modules/filesystem/ErrorCallback.h"
 #include "modules/filesystem/FileEntrySync.h"
-#include "modules/filesystem/SyncCallbackHelper.h"
 
 namespace WebCore {
 
+class DirectoryReaderSync::EntriesCallbackHelper : public EntriesCallback {
+public:
+    EntriesCallbackHelper(PassRefPtr<DirectoryReaderSync> reader)
+        : m_reader(reader)
+    {
+    }
+
+    virtual void handleEvent(const Vector<RefPtr<Entry> >& entries) OVERRIDE
+    {
+        EntrySyncVector syncEntries;
+        syncEntries.reserveInitialCapacity(entries.size());
+        for (size_t i = 0; i < entries.size(); ++i)
+            syncEntries.uncheckedAppend(EntrySync::create(entries[i].get()));
+        m_reader->addEntries(syncEntries);
+    }
+
+private:
+    RefPtr<DirectoryReaderSync> m_reader;
+};
+
+class DirectoryReaderSync::ErrorCallbackHelper : public ErrorCallback {
+public:
+    ErrorCallbackHelper(PassRefPtr<DirectoryReaderSync> reader)
+        : m_reader(reader)
+    {
+    }
+
+    virtual void handleEvent(FileError* error) OVERRIDE
+    {
+        m_reader->setError(error->code());
+    }
+
+private:
+    RefPtr<DirectoryReaderSync> m_reader;
+};
+
 DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
     : DirectoryReaderBase(fileSystem, fullPath)
+    , m_callbacksId(0)
+    , m_errorCode(FileError::OK)
 {
     ScriptWrappable::init(this);
 }
 
 EntrySyncVector DirectoryReaderSync::readEntries(ExceptionState& exceptionState)
 {
-    if (!m_hasMoreEntries)
-        return EntrySyncVector();
+    if (!m_callbacksId) {
+        m_callbacksId = filesystem()->readDirectory(this, m_fullPath, adoptPtr(new EntriesCallbackHelper(this)), adoptPtr(new ErrorCallbackHelper(this)), DOMFileSystemBase::Synchronous);
+    }
 
-    EntriesSyncCallbackHelper helper;
-    if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback(), DOMFileSystemBase::Synchronous)) {
-        exceptionState.throwDOMException(InvalidModificationError, "Failed to read the directory.");
-        setHasMoreEntries(false);
+    if (m_errorCode == FileError::OK && m_hasMoreEntries && m_entries.isEmpty())
+        m_fileSystem->waitForAdditionalResult(m_callbacksId);
+
+    if (m_errorCode != FileError::OK) {
+        FileError::throwDOMException(exceptionState, m_errorCode);
         return EntrySyncVector();
     }
-    return helper.getResult(exceptionState);
+
+    EntrySyncVector result;
+    result.swap(m_entries);
+    return result;
 }
 
 } // namespace