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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/filesystem/DirectoryReaderSync.h" 32 #include "modules/filesystem/DirectoryReaderSync.h"
33 33
34 #include "bindings/v8/ExceptionState.h" 34 #include "bindings/v8/ExceptionState.h"
35 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
36 #include "modules/filesystem/DirectoryEntry.h" 36 #include "modules/filesystem/DirectoryEntry.h"
37 #include "modules/filesystem/DirectoryEntrySync.h" 37 #include "modules/filesystem/DirectoryEntrySync.h"
38 #include "modules/filesystem/EntryArraySync.h"
39 #include "modules/filesystem/EntrySync.h" 38 #include "modules/filesystem/EntrySync.h"
40 #include "modules/filesystem/FileEntrySync.h" 39 #include "modules/filesystem/FileEntrySync.h"
41 #include "modules/filesystem/SyncCallbackHelper.h" 40 #include "modules/filesystem/SyncCallbackHelper.h"
42 41
43 namespace WebCore { 42 namespace WebCore {
44 43
45 DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSyste m, const String& fullPath) 44 DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSyste m, const String& fullPath)
46 : DirectoryReaderBase(fileSystem, fullPath) 45 : DirectoryReaderBase(fileSystem, fullPath)
47 { 46 {
48 ScriptWrappable::init(this); 47 ScriptWrappable::init(this);
49 } 48 }
50 49
51 PassRefPtr<EntryArraySync> DirectoryReaderSync::readEntries(ExceptionState& es) 50 EntrySyncVector DirectoryReaderSync::readEntries(ExceptionState& es)
52 { 51 {
53 if (!m_hasMoreEntries) 52 if (!m_hasMoreEntries)
54 return EntryArraySync::create(); 53 return EntrySyncVector();
55 54
56 EntriesSyncCallbackHelper helper(m_fileSystem->asyncFileSystem()); 55 EntriesSyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
57 if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback())) { 56 if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback())) {
58 es.throwDOMException(InvalidModificationError); 57 es.throwDOMException(InvalidModificationError);
59 setHasMoreEntries(false); 58 setHasMoreEntries(false);
60 return 0; 59 return EntrySyncVector();
61 } 60 }
62 return helper.getResult(es); 61 return helper.getResult(es);
63 } 62 }
64 63
65 } // namespace 64 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698