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

Side by Side Diff: Source/modules/filesystem/DirectoryReaderSync.cpp

Issue 17761003: Remove FileException (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile warning Created 7 years, 5 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 "core/fileapi/FileException.h" 34 #include "core/dom/ExceptionCode.h"
35 #include "modules/filesystem/DirectoryEntry.h" 35 #include "modules/filesystem/DirectoryEntry.h"
36 #include "modules/filesystem/DirectoryEntrySync.h" 36 #include "modules/filesystem/DirectoryEntrySync.h"
37 #include "modules/filesystem/EntryArraySync.h" 37 #include "modules/filesystem/EntryArraySync.h"
38 #include "modules/filesystem/EntrySync.h" 38 #include "modules/filesystem/EntrySync.h"
39 #include "modules/filesystem/FileEntrySync.h" 39 #include "modules/filesystem/FileEntrySync.h"
40 #include "modules/filesystem/SyncCallbackHelper.h" 40 #include "modules/filesystem/SyncCallbackHelper.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSyste m, const String& fullPath) 44 DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSyste m, const String& fullPath)
45 : DirectoryReaderBase(fileSystem, fullPath) 45 : DirectoryReaderBase(fileSystem, fullPath)
46 { 46 {
47 ScriptWrappable::init(this); 47 ScriptWrappable::init(this);
48 } 48 }
49 49
50 PassRefPtr<EntryArraySync> DirectoryReaderSync::readEntries(ExceptionCode& ec) 50 PassRefPtr<EntryArraySync> DirectoryReaderSync::readEntries(ExceptionCode& ec)
51 { 51 {
52 ec = 0; 52 ec = 0;
53 if (!m_hasMoreEntries) 53 if (!m_hasMoreEntries)
54 return EntryArraySync::create(); 54 return EntryArraySync::create();
55 55
56 EntriesSyncCallbackHelper helper(m_fileSystem->asyncFileSystem()); 56 EntriesSyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
57 if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback())) { 57 if (!m_fileSystem->readDirectory(this, m_fullPath, helper.successCallback(), helper.errorCallback())) {
58 ec = FileException::INVALID_MODIFICATION_ERR; 58 ec = FSInvalidModificationError;
59 setHasMoreEntries(false); 59 setHasMoreEntries(false);
60 return 0; 60 return 0;
61 } 61 }
62 return helper.getResult(ec); 62 return helper.getResult(ec);
63 } 63 }
64 64
65 } // namespace 65 } // namespace
OLDNEW
« no previous file with comments | « Source/modules/filesystem/DirectoryEntrySync.cpp ('k') | Source/modules/filesystem/EntrySync.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698