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

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

Issue 17761003: Remove FileException (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile warning Created 7 years, 6 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/WorkerGlobalScopeFileSystem.cpp
diff --git a/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
index 9d11f96fd77118e9f01cdc17cef5f3748ee8b4f7..2ae034773cf4b4f54b36492ff5cb6f9ed2f967be 100644
--- a/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
+++ b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
@@ -28,8 +28,8 @@
#include "config.h"
#include "modules/filesystem/WorkerGlobalScopeFileSystem.h"
+#include "core/dom/ExceptionCode.h"
#include "core/fileapi/FileError.h"
-#include "core/fileapi/FileException.h"
#include "core/platform/AsyncFileSystem.h"
#include "core/workers/WorkerGlobalScope.h"
#include "modules/filesystem/DOMFileSystemBase.h"
@@ -68,13 +68,13 @@ PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSyst
ec = 0;
ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
if (!secureContext->securityOrigin()->canAccessFileSystem()) {
- ec = FileException::SECURITY_ERR;
+ ec = FSSecurityError;
return 0;
}
FileSystemType fileSystemType = static_cast<FileSystemType>(type);
if (!DOMFileSystemBase::isValidType(fileSystemType)) {
- ec = FileException::INVALID_MODIFICATION_ERR;
+ ec = FSInvalidModificationError;
return 0;
}
@@ -108,14 +108,14 @@ PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemS
KURL completedURL = worker->completeURL(url);
ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
if (!secureContext->securityOrigin()->canAccessFileSystem() || !secureContext->securityOrigin()->canRequest(completedURL)) {
- ec = FileException::SECURITY_ERR;
+ ec = FSSecurityError;
return 0;
}
FileSystemType type;
String filePath;
if (!completedURL.isValid() || !DOMFileSystemBase::crackFileSystemURL(completedURL, type, filePath)) {
- ec = FileException::ENCODING_ERR;
+ ec = FSEncodingError;
return 0;
}
@@ -126,7 +126,7 @@ PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemS
return 0;
RefPtr<EntrySync> entry = fileSystem->root()->getDirectory(filePath, Dictionary(), ec);
- if (ec == FileException::TYPE_MISMATCH_ERR)
+ if (ec == FSTypeMismatchError)
return fileSystem->root()->getFile(filePath, Dictionary(), ec);
return entry.release();
« no previous file with comments | « Source/modules/filesystem/SyncCallbackHelper.h ('k') | Source/modules/filesystem/WorkerGlobalScopeFileSystem.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698