Changeset 262999 in webkit for trunk/Source/WebCore/fileapi/FileReaderSync.cpp

Timestamp:

Jun 13, 2020, 9:24:15 AM (5 years ago)

Author:

[email protected]

Message:

Remove FileError.h
​https://bugs.webkit.org/show_bug.cgi?id=213119

Patch by Tetsuharu Ohzeki <Tetsuharu Ohzeki> on 2020-06-13
Reviewed by Chris Dumez.

Source/WebCore:

• Headers.cmake:
• Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp:

(WebCore::ClipboardItemBindingsDataSource::ClipboardItemTypeLoader::didFail):

• Modules/async-clipboard/ClipboardItemBindingsDataSource.h:
• Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::createMessageQueue):

• Modules/websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::didFail):
(WebCore::WebSocketChannel::abortOutgoingFrameQueue):

• Modules/websockets/WebSocketChannel.h:
• WebCore.xcodeproj/project.pbxproj:
• fileapi/BlobLoader.h:

(WebCore::BlobLoader::didFail):

• fileapi/FileError.h: Removed.
• fileapi/FileReader.cpp:

(WebCore::FileReader::didFail):

• fileapi/FileReader.h:
• fileapi/FileReaderLoader.cpp:

(WebCore::FileReaderLoader::start):
(WebCore::FileReaderLoader::cancel):
(WebCore::FileReaderLoader::cleanup):
(WebCore::FileReaderLoader::didReceiveResponse):
(WebCore::FileReaderLoader::didReceiveData):
(WebCore::FileReaderLoader::didFail):
(WebCore::FileReaderLoader::failed):
(WebCore::FileReaderLoader::toErrorCode):
(WebCore::FileReaderLoader::httpStatusCodeToErrorCode):
(WebCore::FileReaderLoader::arrayBufferResult const):
(WebCore::FileReaderLoader::stringResult):

• fileapi/FileReaderLoader.h:

(WebCore::FileReaderLoader::errorCode const):

• fileapi/FileReaderLoaderClient.h:
• fileapi/FileReaderSync.cpp:

(WebCore::FileReaderSync::startLoading):

• fileapi/FileReaderSync.h:
• fileapi/NetworkSendQueue.cpp:

(WebCore::NetworkSendQueue::processMessages):

• fileapi/NetworkSendQueue.h:
• html/ImageBitmap.cpp:

Source/WebKit:

• WebProcess/Network/WebSocketChannel.cpp:

(WebKit::WebSocketChannel::createMessageQueue):

File:

• trunk/Source/WebCore/fileapi/FileReaderSync.cpp (modified) (2 diffs)

trunk/Source/WebCore/fileapi/FileReaderSync.cpp

@@ -35 +35 @@
 #include "Blob.h"
 #include "BlobURL.h"
-#include "FileError.h"
 #include "FileReaderLoader.h"
 #include <JavaScriptCore/ArrayBuffer.h>
@@ -74 +73 @@
 }
 
-ExceptionOr<void> FileReaderSync::errorCodeToException(FileError::ErrorCode errorCode)
-{
-    switch (errorCode) {
-    case FileError::OK:
-        return { };
-    case FileError::NOT_FOUND_ERR:
-        return Exception { NotFoundError };
-    case FileError::SECURITY_ERR:
-        return Exception { SecurityError };
-    case FileError::ABORT_ERR:
-        return Exception { AbortError };
-    case FileError::NOT_READABLE_ERR:
-        return Exception { NotReadableError };
-    case FileError::ENCODING_ERR:
-        return Exception { EncodingError };
-    case FileError::NO_MODIFICATION_ALLOWED_ERR:
-        return Exception { NoModificationAllowedError };
-    case FileError::INVALID_STATE_ERR:
-        return Exception { InvalidStateError };
-    case FileError::SYNTAX_ERR:
-        return Exception { SyntaxError };
-    case FileError::INVALID_MODIFICATION_ERR:
-        return Exception { InvalidModificationError };
-    case FileError::QUOTA_EXCEEDED_ERR:
-        return Exception { QuotaExceededError };
-    case FileError::TYPE_MISMATCH_ERR:
-        return Exception { TypeMismatchError };
-    case FileError::PATH_EXISTS_ERR:
-        return Exception { NoModificationAllowedError };
-    }
-    return Exception { UnknownError };
-}
-
 ExceptionOr<void> FileReaderSync::startLoading(ScriptExecutionContext& scriptExecutionContext, FileReaderLoader& loader, Blob& blob)
 {
     loader.start(&scriptExecutionContext, blob);
-    return errorCodeToException(loader.errorCode());
+    auto error = loader.errorCode();
+    if (!error)
+        return { };
+    
+    return Exception { error.value() };
 }