Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: Source/modules/filesystem/DirectoryReaderSync.cpp

Issue 22673003: Replace EntryArraySync type by an EntrySync[] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use traits classes to simplify the code Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/filesystem/DirectoryReaderSync.cpp
diff --git a/Source/modules/filesystem/DirectoryReaderSync.cpp b/Source/modules/filesystem/DirectoryReaderSync.cpp
index 083579b7684e6e23185c003c5f1bb07aaaf71711..3532c200b280fe9273143ce9d4e6e00d752c7872 100644
--- a/Source/modules/filesystem/DirectoryReaderSync.cpp
+++ b/Source/modules/filesystem/DirectoryReaderSync.cpp
@@ -35,7 +35,6 @@
#include "core/dom/ExceptionCode.h"
#include "modules/filesystem/DirectoryEntry.h"
#include "modules/filesystem/DirectoryEntrySync.h"
-#include "modules/filesystem/EntryArraySync.h"
#include "modules/filesystem/EntrySync.h"
#include "modules/filesystem/FileEntrySync.h"
#include "modules/filesystem/SyncCallbackHelper.h"
@@ -48,16 +47,16 @@ DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSyste
ScriptWrappable::init(this);
}
-PassRefPtr<EntryArraySync> DirectoryReaderSync::readEntries(ExceptionState& es)
+EntrySyncVector DirectoryReaderSync::readEntries(ExceptionState& es)
{
if (!m_hasMoreEntries)
- return EntryArraySync::create();
+ return EntrySyncVector();
EntriesSyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback())) {
es.throwDOMException(InvalidModificationError);
setHasMoreEntries(false);
- return 0;
+ return EntrySyncVector();
}
return helper.getResult(es);
}

Powered by Google App Engine
This is Rietveld 408576698