Index: third_party/WebKit/Source/core/fileapi/FileError.cpp |
diff --git a/third_party/WebKit/Source/core/fileapi/FileError.cpp b/third_party/WebKit/Source/core/fileapi/FileError.cpp |
index 4e17dd5ea0b9732594f2a3d7108fc8e575e53aa2..0f5813fdd7a6523c9fe943a79449431e8ca6df66 100644 |
--- a/third_party/WebKit/Source/core/fileapi/FileError.cpp |
+++ b/third_party/WebKit/Source/core/fileapi/FileError.cpp |
@@ -31,52 +31,55 @@ |
#include "core/fileapi/FileError.h" |
#include "bindings/core/v8/ExceptionState.h" |
+#include "core/dom/DOMException.h" |
#include "core/dom/ExceptionCode.h" |
namespace blink { |
-const char FileError::abortErrorMessage[] = "An ongoing operation was aborted, typically with a call to abort()."; |
-const char FileError::encodingErrorMessage[] = "A URI supplied to the API was malformed, or the resulting Data URL has exceeded the URL length limitations for Data URLs."; |
-const char FileError::invalidStateErrorMessage[] = "An operation that depends on state cached in an interface object was made but the state had changed since it was read from disk."; |
-const char FileError::noModificationAllowedErrorMessage[] = "An attempt was made to write to a file or directory which could not be modified due to the state of the underlying filesystem."; |
-const char FileError::notFoundErrorMessage[] = "A requested file or directory could not be found at the time an operation was processed."; |
-const char FileError::notReadableErrorMessage[] = "The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired."; |
-const char FileError::pathExistsErrorMessage[] = "An attempt was made to create a file or directory where an element already exists."; |
-const char FileError::quotaExceededErrorMessage[] = "The operation failed because it would cause the application to exceed its storage quota."; |
-const char FileError::securityErrorMessage[] = "It was determined that certain files are unsafe for access within a Web application, or that too many calls are being made on file resources."; |
-const char FileError::syntaxErrorMessage[] = "An invalid or unsupported argument was given, like an invalid line ending specifier."; |
-const char FileError::typeMismatchErrorMessage[] = "The path supplied exists, but was not an entry of requested type."; |
+namespace FileError { |
+ |
+const char abortErrorMessage[] = "An ongoing operation was aborted, typically with a call to abort()."; |
+const char encodingErrorMessage[] = "A URI supplied to the API was malformed, or the resulting Data URL has exceeded the URL length limitations for Data URLs."; |
+const char invalidStateErrorMessage[] = "An operation that depends on state cached in an interface object was made but the state had changed since it was read from disk."; |
+const char noModificationAllowedErrorMessage[] = "An attempt was made to write to a file or directory which could not be modified due to the state of the underlying filesystem."; |
+const char notFoundErrorMessage[] = "A requested file or directory could not be found at the time an operation was processed."; |
+const char notReadableErrorMessage[] = "The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired."; |
+const char pathExistsErrorMessage[] = "An attempt was made to create a file or directory where an element already exists."; |
+const char quotaExceededErrorMessage[] = "The operation failed because it would cause the application to exceed its storage quota."; |
+const char securityErrorMessage[] = "It was determined that certain files are unsafe for access within a Web application, or that too many calls are being made on file resources."; |
+const char syntaxErrorMessage[] = "An invalid or unsupported argument was given, like an invalid line ending specifier."; |
+const char typeMismatchErrorMessage[] = "The path supplied exists, but was not an entry of requested type."; |
namespace { |
-ExceptionCode errorCodeToExceptionCode(FileError::ErrorCode code) |
+ExceptionCode errorCodeToExceptionCode(ErrorCode code) |
{ |
switch (code) { |
- case FileError::OK: |
+ case OK: |
return 0; |
- case FileError::NOT_FOUND_ERR: |
+ case NOT_FOUND_ERR: |
return NotFoundError; |
- case FileError::SECURITY_ERR: |
+ case SECURITY_ERR: |
return SecurityError; |
- case FileError::ABORT_ERR: |
+ case ABORT_ERR: |
return AbortError; |
- case FileError::NOT_READABLE_ERR: |
+ case NOT_READABLE_ERR: |
return NotReadableError; |
- case FileError::ENCODING_ERR: |
+ case ENCODING_ERR: |
return EncodingError; |
- case FileError::NO_MODIFICATION_ALLOWED_ERR: |
+ case NO_MODIFICATION_ALLOWED_ERR: |
return NoModificationAllowedError; |
- case FileError::INVALID_STATE_ERR: |
+ case INVALID_STATE_ERR: |
return InvalidStateError; |
- case FileError::SYNTAX_ERR: |
+ case SYNTAX_ERR: |
return SyntaxError; |
- case FileError::INVALID_MODIFICATION_ERR: |
+ case INVALID_MODIFICATION_ERR: |
return InvalidModificationError; |
- case FileError::QUOTA_EXCEEDED_ERR: |
+ case QUOTA_EXCEEDED_ERR: |
return QuotaExceededError; |
- case FileError::TYPE_MISMATCH_ERR: |
+ case TYPE_MISMATCH_ERR: |
return TypeMismatchError; |
- case FileError::PATH_EXISTS_ERR: |
+ case PATH_EXISTS_ERR: |
return PathExistsError; |
default: |
ASSERT_NOT_REACHED(); |
@@ -84,36 +87,36 @@ ExceptionCode errorCodeToExceptionCode(FileError::ErrorCode code) |
} |
} |
-const char* errorCodeToMessage(FileError::ErrorCode code) |
+const char* errorCodeToMessage(ErrorCode code) |
{ |
// Note that some of these do not set message. If message is 0 then the default message is used. |
switch (code) { |
- case FileError::OK: |
+ case OK: |
return 0; |
- case FileError::SECURITY_ERR: |
- return FileError::securityErrorMessage; |
- case FileError::NOT_FOUND_ERR: |
- return FileError::notFoundErrorMessage; |
- case FileError::ABORT_ERR: |
- return FileError::abortErrorMessage; |
- case FileError::NOT_READABLE_ERR: |
- return FileError::notReadableErrorMessage; |
- case FileError::ENCODING_ERR: |
- return FileError::encodingErrorMessage; |
- case FileError::NO_MODIFICATION_ALLOWED_ERR: |
- return FileError::noModificationAllowedErrorMessage; |
- case FileError::INVALID_STATE_ERR: |
- return FileError::invalidStateErrorMessage; |
- case FileError::SYNTAX_ERR: |
- return FileError::syntaxErrorMessage; |
- case FileError::INVALID_MODIFICATION_ERR: |
+ case SECURITY_ERR: |
+ return securityErrorMessage; |
+ case NOT_FOUND_ERR: |
+ return notFoundErrorMessage; |
+ case ABORT_ERR: |
+ return abortErrorMessage; |
+ case NOT_READABLE_ERR: |
+ return notReadableErrorMessage; |
+ case ENCODING_ERR: |
+ return encodingErrorMessage; |
+ case NO_MODIFICATION_ALLOWED_ERR: |
+ return noModificationAllowedErrorMessage; |
+ case INVALID_STATE_ERR: |
+ return invalidStateErrorMessage; |
+ case SYNTAX_ERR: |
+ return syntaxErrorMessage; |
+ case INVALID_MODIFICATION_ERR: |
return 0; |
- case FileError::QUOTA_EXCEEDED_ERR: |
- return FileError::quotaExceededErrorMessage; |
- case FileError::TYPE_MISMATCH_ERR: |
+ case QUOTA_EXCEEDED_ERR: |
+ return quotaExceededErrorMessage; |
+ case TYPE_MISMATCH_ERR: |
return 0; |
- case FileError::PATH_EXISTS_ERR: |
- return FileError::pathExistsErrorMessage; |
+ case PATH_EXISTS_ERR: |
+ return pathExistsErrorMessage; |
default: |
ASSERT_NOT_REACHED(); |
return 0; |
@@ -122,24 +125,26 @@ const char* errorCodeToMessage(FileError::ErrorCode code) |
} // namespace |
-void FileError::throwDOMException(ExceptionState& exceptionState, ErrorCode code) |
+void throwDOMException(ExceptionState& exceptionState, ErrorCode code) |
{ |
- if (code == FileError::OK) |
+ if (code == OK) |
return; |
// SecurityError is special-cased, as we want to route those exceptions through ExceptionState::throwSecurityError. |
- if (code == FileError::SECURITY_ERR) { |
- exceptionState.throwSecurityError(FileError::securityErrorMessage); |
+ if (code == SECURITY_ERR) { |
+ exceptionState.throwSecurityError(securityErrorMessage); |
return; |
} |
exceptionState.throwDOMException(errorCodeToExceptionCode(code), errorCodeToMessage(code)); |
} |
-FileError::FileError(ErrorCode code) |
- : DOMError(DOMException::getErrorName(errorCodeToExceptionCode(code)), errorCodeToMessage(code)) |
- , m_code(code) |
+DOMException* createDOMException(ErrorCode code) |
{ |
+ DCHECK_NE(code, OK); |
+ return DOMException::create(errorCodeToExceptionCode(code), errorCodeToMessage(code)); |
} |
+} // namespace FileError |
+ |
} // namespace blink |