Changeset 262999 in webkit


Ignore:
Timestamp:
Jun 13, 2020, 9:24:15 AM (5 years ago)
Author:
commit-queue@webkit.org
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):

Location:
trunk/Source
Files:
1 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r262996 r262999  
     12020-06-13  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
     2
     3        Remove FileError.h
     4        https://bugs.webkit.org/show_bug.cgi?id=213119
     5
     6        Reviewed by Chris Dumez.
     7
     8        * Headers.cmake:
     9        * Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp:
     10        (WebCore::ClipboardItemBindingsDataSource::ClipboardItemTypeLoader::didFail):
     11        * Modules/async-clipboard/ClipboardItemBindingsDataSource.h:
     12        * Modules/mediastream/RTCDataChannel.cpp:
     13        (WebCore::RTCDataChannel::createMessageQueue):
     14        * Modules/websockets/WebSocketChannel.cpp:
     15        (WebCore::WebSocketChannel::didFail):
     16        (WebCore::WebSocketChannel::abortOutgoingFrameQueue):
     17        * Modules/websockets/WebSocketChannel.h:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * fileapi/BlobLoader.h:
     20        (WebCore::BlobLoader::didFail):
     21        * fileapi/FileError.h: Removed.
     22        * fileapi/FileReader.cpp:
     23        (WebCore::FileReader::didFail):
     24        * fileapi/FileReader.h:
     25        * fileapi/FileReaderLoader.cpp:
     26        (WebCore::FileReaderLoader::start):
     27        (WebCore::FileReaderLoader::cancel):
     28        (WebCore::FileReaderLoader::cleanup):
     29        (WebCore::FileReaderLoader::didReceiveResponse):
     30        (WebCore::FileReaderLoader::didReceiveData):
     31        (WebCore::FileReaderLoader::didFail):
     32        (WebCore::FileReaderLoader::failed):
     33        (WebCore::FileReaderLoader::toErrorCode):
     34        (WebCore::FileReaderLoader::httpStatusCodeToErrorCode):
     35        (WebCore::FileReaderLoader::arrayBufferResult const):
     36        (WebCore::FileReaderLoader::stringResult):
     37        * fileapi/FileReaderLoader.h:
     38        (WebCore::FileReaderLoader::errorCode const):
     39        * fileapi/FileReaderLoaderClient.h:
     40        * fileapi/FileReaderSync.cpp:
     41        (WebCore::FileReaderSync::startLoading):
     42        * fileapi/FileReaderSync.h:
     43        * fileapi/NetworkSendQueue.cpp:
     44        (WebCore::NetworkSendQueue::processMessages):
     45        * fileapi/NetworkSendQueue.h:
     46        * html/ImageBitmap.cpp:
     47
    1482020-06-12  Simon Fraser  <simon.fraser@apple.com>
    249

  • trunk/Source/WebCore/Headers.cmake

    r262933 r262999  
    535535    fileapi/EndingType.h
    536536    fileapi/File.h
    537     fileapi/FileError.h
    538537    fileapi/FileList.h
    539538    fileapi/FileReaderLoader.h

  • trunk/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.cpp

    r261395 r262999  
    3232#include "ClipboardItem.h"
    3333#include "Document.h"
     34#include "ExceptionCode.h"
    3435#include "FileReaderLoader.h"
    3536#include "Frame.h"
    … …  
    250251}
    251252
    252 void ClipboardItemBindingsDataSource::ClipboardItemTypeLoader::didFail(int)
     253void ClipboardItemBindingsDataSource::ClipboardItemTypeLoader::didFail(ExceptionCode)
    253254{
    254255    ASSERT(m_blobLoader);

  • trunk/Source/WebCore/Modules/async-clipboard/ClipboardItemBindingsDataSource.h

    r253486 r262999  
    2727
    2828#include "ClipboardItemDataSource.h"
     29#include "ExceptionCode.h"
    2930#include "FileReaderLoaderClient.h"
    3031#include <wtf/Optional.h>
    … …  
    8182        void didReceiveData() final { }
    8283        void didFinishLoading() final;
    83         void didFail(int) final;
     84        void didFail(ExceptionCode) final;
    8485
    8586        String m_type;

  • trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

    r261013 r262999  
    3131#include "Blob.h"
    3232#include "EventNames.h"
     33#include "ExceptionCode.h"
    3334#include "MessageEvent.h"
    3435#include "ScriptExecutionContext.h"
    … …  
    7273        if (!channel.m_handler->sendRawData(data, length))
    7374            channel.scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, "Error sending binary data through RTCDataChannel."_s);
    74     }, [&channel](int errorCode) {
    75         if (auto* context = channel.scriptExecutionContext())
    76             context->addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString("Error ", errorCode, " in retrieving a blob data to be sent through RTCDataChannel."));
     75    }, [&channel](ExceptionCode errorCode) {
     76        if (auto* context = channel.scriptExecutionContext()) {
     77            auto code = static_cast<int>(errorCode);
     78            context->addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString("Error ", code, " in retrieving a blob data to be sent through RTCDataChannel."));
     79        }
    7780        return NetworkSendQueue::Continue::Yes;
    7881    } };

  • trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp

    r252633 r262999  
    3737#include "CookieJar.h"
    3838#include "Document.h"
    39 #include "FileError.h"
     39#include "ExceptionCode.h"
    4040#include "FileReaderLoader.h"
    4141#include "Frame.h"
    … …  
    396396}
    397397
    398 void WebSocketChannel::didFail(int errorCode)
    399 {
    400     LOG(Network, "WebSocketChannel %p didFail() errorCode=%d", this, errorCode);
     398void WebSocketChannel::didFail(ExceptionCode errorCode)
     399{
     400    auto code = static_cast<int>(errorCode);
     401    LOG(Network, "WebSocketChannel %p didFail() errorCode=%d", this, code);
    401402    ASSERT(m_blobLoader);
    402403    ASSERT(m_blobLoaderStatus == BlobLoaderStarted);
    403404    m_blobLoader = nullptr;
    404405    m_blobLoaderStatus = BlobLoaderFailed;
    405     fail(makeString("Failed to load Blob: error code = ", errorCode)); // FIXME: Generate human-friendly reason message.
     406    fail(makeString("Failed to load Blob: error code = ", code)); // FIXME: Generate human-friendly reason message.
    406407    deref();
    407408}
    … …  
    810811    if (m_blobLoaderStatus == BlobLoaderStarted) {
    811812        m_blobLoader->cancel();
    812         didFail(FileError::ABORT_ERR);
     813        didFail(AbortError);
    813814    }
    814815}

  • trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h

    r260415 r262999  
    3131#pragma once
    3232
     33#include "ExceptionCode.h"
    3334#include "FileReaderLoaderClient.h"
    3435#include "SocketStreamHandleClient.h"
    … …  
    114115    void didReceiveData() override;
    115116    void didFinishLoading() override;
    116     void didFail(int errorCode) override;
     117    void didFail(ExceptionCode errorCode) override;
    117118
    118119    unsigned identifier() const { return m_identifier; }

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r262953 r262999  
    28242824                976D6C7F122B8A3D001FD1F7 /* BlobURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C60122B8A3D001FD1F7 /* BlobURL.h */; };
    28252825                976D6C81122B8A3D001FD1F7 /* File.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C62122B8A3D001FD1F7 /* File.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2826                 976D6C83122B8A3D001FD1F7 /* FileError.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C64122B8A3D001FD1F7 /* FileError.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28272826                976D6C86122B8A3D001FD1F7 /* FileList.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C67122B8A3D001FD1F7 /* FileList.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28282827                976D6C89122B8A3D001FD1F7 /* FileReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C6A122B8A3D001FD1F7 /* FileReader.h */; };
    … …  
    1116611165                976D6C61122B8A3D001FD1F7 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
    1116711166                976D6C62122B8A3D001FD1F7 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
    11168                 976D6C64122B8A3D001FD1F7 /* FileError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileError.h; sourceTree = "<group>"; };
    1116911167                976D6C66122B8A3D001FD1F7 /* FileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileList.cpp; sourceTree = "<group>"; };
    1117011168                976D6C67122B8A3D001FD1F7 /* FileList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileList.h; sourceTree = "<group>"; };
    … …  
    2292122919                                E1AB1EB714E9E35800449E13 /* File.idl */,
    2292222920                                E164A2E7191AC5BB0010737D /* FileCocoa.mm */,
    22923                                 976D6C64122B8A3D001FD1F7 /* FileError.h */,
    2292422921                                976D6C66122B8A3D001FD1F7 /* FileList.cpp */,
    2292522922                                976D6C67122B8A3D001FD1F7 /* FileList.h */,
    … …  
    3058330580                                838F86DA1F509E7400E8CFC5 /* FileCallback.h in Headers */,
    3058430581                                066C772B0AB603B700238CC4 /* FileChooser.h in Headers */,
    30585                                 976D6C83122B8A3D001FD1F7 /* FileError.h in Headers */,
    3058630582                                5351D4B11DF916B4008010CD /* FileHandle.h in Headers */,
    3058730583                                1A88A90517553CD7000C74F9 /* FileIconLoader.h in Headers */,

  • trunk/Source/WebCore/fileapi/BlobLoader.h

    r249481 r262999  
    2828#include "Blob.h"
    2929#include "Document.h"
     30#include "ExceptionCode.h"
    3031#include "FileReaderLoader.h"
    3132#include "FileReaderLoaderClient.h"
    … …  
    3334#include <JavaScriptCore/ArrayBuffer.h>
    3435#include <wtf/CompletionHandler.h>
     36#include <wtf/Optional.h>
    3537
    3638namespace WebCore {
    … …  
    4446    bool isLoading() const { return !!m_loader; }
    4547    const RefPtr<JSC::ArrayBuffer>& result() const { return m_buffer; }
    46     int errorCode() const { return m_errorCode; }
     48    Optional<ExceptionCode> errorCode() const { return m_errorCode; }
    4749
    4850private:
    … …  
    5153
    5254    void didFinishLoading() final;
    53     void didFail(int errorCode) final;
     55    void didFail(ExceptionCode errorCode) final;
    5456    void complete();
    5557
    5658    std::unique_ptr<FileReaderLoader> m_loader;
    5759    RefPtr<JSC::ArrayBuffer> m_buffer;
    58     int m_errorCode { 0 };
     60    Optional<ExceptionCode> m_errorCode;
    5961    CompletionHandler<void()> m_completionHandler;
    6062};
    … …  
    7981}
    8082
    81 inline void BlobLoader::didFail(int errorCode)
     83inline void BlobLoader::didFail(ExceptionCode errorCode)
    8284{
    8385    m_errorCode = errorCode;

  • trunk/Source/WebCore/fileapi/FileReader.cpp

    r262953 r262999  
    3838#include "ExceptionCode.h"
    3939#include "File.h"
    40 #include "FileError.h"
    4140#include "Logging.h"
    4241#include "ProgressEvent.h"
    … …  
    212211}
    213212
    214 void FileReader::didFail(int errorCode)
     213void FileReader::didFail(ExceptionCode errorCode)
    215214{
    216215    // If we're aborting, do not proceed with normal error handling since it is covered in aborting code.
    … …  
    222221        m_state = DONE;
    223222
    224         auto e = FileReaderSync::errorCodeToException(static_cast<FileError::ErrorCode>(errorCode));
    225         ASSERT(e.hasException());
    226         m_error = DOMException::create(e.exception());
     223        m_error = DOMException::create(Exception { errorCode });
    227224
    228225        fireEvent(eventNames().errorEvent);

  • trunk/Source/WebCore/fileapi/FileReader.h

    r262953 r262999  
    3434#include "DOMException.h"
    3535#include "EventTarget.h"
     36#include "ExceptionCode.h"
    3637#include "ExceptionOr.h"
    3738#include "FileReaderLoader.h"
    … …  
    9697    void didReceiveData() final;
    9798    void didFinishLoading() final;
    98     void didFail(int errorCode) final;
     99    void didFail(ExceptionCode errorCode) final;
    99100
    100101    ExceptionOr<void> readInternal(Blob&, FileReaderLoader::ReadType);

  • trunk/Source/WebCore/fileapi/FileReaderLoader.cpp

    r250061 r262999  
    3535#include "Blob.h"
    3636#include "BlobURL.h"
     37#include "ExceptionCode.h"
    3738#include "FileReaderLoaderClient.h"
    3839#include "HTTPHeaderNames.h"
    … …  
    7980    m_urlForReading = BlobURL::createPublicURL(scriptExecutionContext->securityOrigin());
    8081    if (m_urlForReading.isEmpty()) {
    81         failed(FileError::SECURITY_ERR);
     82        failed(SecurityError);
    8283        return;
    8384    }
    … …  
    103104void FileReaderLoader::cancel()
    104105{
    105     m_errorCode = FileError::ABORT_ERR;
     106    m_errorCode = AbortError;
    106107    terminate();
    107108}
    … …  
    145146    // FIXME: Support reading more than the current size limit of ArrayBuffer.
    146147    if (length > std::numeric_limits<unsigned>::max()) {
    147         failed(FileError::NOT_READABLE_ERR);
     148        failed(NotReadableError);
    148149        return;
    149150    }
    … …  
    153154
    154155    if (!m_rawData) {
    155         failed(FileError::NOT_READABLE_ERR);
     156        failed(NotReadableError);
    156157        return;
    157158    }
    … …  
    177178        // If the buffer has hit maximum size, it can't be grown any more.
    178179        if (m_totalBytes >= std::numeric_limits<unsigned>::max()) {
    179             failed(FileError::NOT_READABLE_ERR);
     180            failed(NotReadableError);
    180181            return;
    181182        }
    … …  
    183184            unsigned newLength = m_totalBytes + static_cast<unsigned>(dataLength);
    184185            if (newLength < m_totalBytes) {
    185                 failed(FileError::NOT_READABLE_ERR);
     186                failed(NotReadableError);
    186187                return;
    187188            }
    … …  
    190191            if (!newData) {
    191192                // Not enough memory.
    192                 failed(FileError::NOT_READABLE_ERR);
     193                failed(NotReadableError);
    193194                return;
    194195            }
    … …  
    229230{
    230231    // If we're aborting, do not proceed with normal error handling since it is covered in aborting code.
    231     if (m_errorCode == FileError::ABORT_ERR)
     232    if (m_errorCode && m_errorCode.value() == AbortError)
    232233        return;
    233234
    … …  
    235236}
    236237
    237 void FileReaderLoader::failed(FileError::ErrorCode errorCode)
     238void FileReaderLoader::failed(ExceptionCode errorCode)
    238239{
    239240    m_errorCode = errorCode;
    240241    cleanup();
    241242    if (m_client)
    242         m_client->didFail(m_errorCode);
    243 }
    244 
    245 FileError::ErrorCode FileReaderLoader::toErrorCode(BlobResourceHandle::Error error)
     243        m_client->didFail(errorCode);
     244}
     245
     246ExceptionCode FileReaderLoader::toErrorCode(BlobResourceHandle::Error error)
    246247{
    247248    switch (error) {
    248249    case BlobResourceHandle::Error::NotFoundError:
    249         return FileError::NOT_FOUND_ERR;
     250        return NotFoundError;
    250251    default:
    251         return FileError::NOT_READABLE_ERR;
    252     }
    253 }
    254 
    255 FileError::ErrorCode FileReaderLoader::httpStatusCodeToErrorCode(int httpStatusCode)
     252        return NotReadableError;
     253    }
     254}
     255
     256ExceptionCode FileReaderLoader::httpStatusCodeToErrorCode(int httpStatusCode)
    256257{
    257258    switch (httpStatusCode) {
    258259    case 403:
    259         return FileError::SECURITY_ERR;
     260        return SecurityError;
    260261    default:
    261         return FileError::NOT_READABLE_ERR;
     262        return NotReadableError;
    262263    }
    263264}

  • trunk/Source/WebCore/fileapi/FileReaderLoader.h

    r250287 r262999  
    3232
    3333#include "BlobResourceHandle.h"
    34 #include "FileError.h"
     34#include "ExceptionCode.h"
    3535#include <wtf/URL.h>
    3636#include "TextEncoding.h"
    3737#include "ThreadableLoaderClient.h"
    3838#include <wtf/Forward.h>
     39#include <wtf/Optional.h>
    3940#include <wtf/text/WTFString.h>
    4041
    … …  
    7879    unsigned bytesLoaded() const { return m_bytesLoaded; }
    7980    unsigned totalBytes() const { return m_totalBytes; }
    80     FileError::ErrorCode errorCode() const { return m_errorCode; }
     81    Optional<ExceptionCode> errorCode() const { return m_errorCode; }
    8182
    8283    void setEncoding(const String&);
    … …  
    8889    void terminate();
    8990    void cleanup();
    90     void failed(FileError::ErrorCode);
     91    void failed(ExceptionCode);
    9192    void convertToText();
    9293    void convertToDataURL();
    … …  
    9495    bool isCompleted() const;
    9596
    96     static FileError::ErrorCode httpStatusCodeToErrorCode(int);
    97     static FileError::ErrorCode toErrorCode(BlobResourceHandle::Error);
     97    static ExceptionCode httpStatusCodeToErrorCode(int);
     98    static ExceptionCode toErrorCode(BlobResourceHandle::Error);
    9899
    99100    ReadType m_readType;
    … …  
    118119    unsigned m_totalBytes;
    119120
    120     FileError::ErrorCode m_errorCode { FileError::OK };
     121    Optional<ExceptionCode> m_errorCode;
    121122};
    122123

  • trunk/Source/WebCore/fileapi/FileReaderLoaderClient.h

    r223728 r262999  
    3131#pragma once
    3232
     33#include "ExceptionCode.h"
     34
    3335namespace WebCore {
    3436
    … …  
    4042    virtual void didReceiveData() = 0;
    4143    virtual void didFinishLoading() = 0;
    42     virtual void didFail(int errorCode) = 0;
     44    virtual void didFail(ExceptionCode errorCode) = 0;
    4345};
    4446

  • trunk/Source/WebCore/fileapi/FileReaderSync.cpp

    r262953 r262999  
    3535#include "Blob.h"
    3636#include "BlobURL.h"
    37 #include "FileError.h"
    3837#include "FileReaderLoader.h"
    3938#include <JavaScriptCore/ArrayBuffer.h>
    … …  
    7473}
    7574
    76 ExceptionOr<void> FileReaderSync::errorCodeToException(FileError::ErrorCode errorCode)
    77 {
    78     switch (errorCode) {
    79     case FileError::OK:
    80         return { };
    81     case FileError::NOT_FOUND_ERR:
    82         return Exception { NotFoundError };
    83     case FileError::SECURITY_ERR:
    84         return Exception { SecurityError };
    85     case FileError::ABORT_ERR:
    86         return Exception { AbortError };
    87     case FileError::NOT_READABLE_ERR:
    88         return Exception { NotReadableError };
    89     case FileError::ENCODING_ERR:
    90         return Exception { EncodingError };
    91     case FileError::NO_MODIFICATION_ALLOWED_ERR:
    92         return Exception { NoModificationAllowedError };
    93     case FileError::INVALID_STATE_ERR:
    94         return Exception { InvalidStateError };
    95     case FileError::SYNTAX_ERR:
    96         return Exception { SyntaxError };
    97     case FileError::INVALID_MODIFICATION_ERR:
    98         return Exception { InvalidModificationError };
    99     case FileError::QUOTA_EXCEEDED_ERR:
    100         return Exception { QuotaExceededError };
    101     case FileError::TYPE_MISMATCH_ERR:
    102         return Exception { TypeMismatchError };
    103     case FileError::PATH_EXISTS_ERR:
    104         return Exception { NoModificationAllowedError };
    105     }
    106     return Exception { UnknownError };
    107 }
    108 
    10975ExceptionOr<void> FileReaderSync::startLoading(ScriptExecutionContext& scriptExecutionContext, FileReaderLoader& loader, Blob& blob)
    11076{
    11177    loader.start(&scriptExecutionContext, blob);
    112     return errorCodeToException(loader.errorCode());
     78    auto error = loader.errorCode();
     79    if (!error)
     80        return { };
     81   
     82    return Exception { error.value() };
    11383}
    11484

  • trunk/Source/WebCore/fileapi/FileReaderSync.h

    r262953 r262999  
    3232
    3333#include "ExceptionOr.h"
    34 #include "FileError.h"
    3534
    3635namespace JSC {
    … …  
    5655    ExceptionOr<String> readAsDataURL(ScriptExecutionContext&, Blob&);
    5756
    58     static ExceptionOr<void> errorCodeToException(FileError::ErrorCode);
    59 
    6057private:
    6158    FileReaderSync();

  • trunk/Source/WebCore/fileapi/NetworkSendQueue.cpp

    r249527 r262999  
    8686            m_writeRawData(data->data(), data->size());
    8787        }, [this, &shouldStopProcessing](UniqueRef<BlobLoader>& loader) {
    88             if (loader->isLoading() || loader->errorCode() == FileError::ABORT_ERR) {
     88            auto errorCode = loader->errorCode();
     89            if (loader->isLoading() || (errorCode && errorCode.value() == AbortError)) {
    8990                shouldStopProcessing = true;
    9091                return;
    … …  
    9596                return;
    9697            }
    97             ASSERT(loader->errorCode());
    98             shouldStopProcessing = m_processError(loader->errorCode()) == Continue::No;
     98            ASSERT(errorCode);
     99            shouldStopProcessing = m_processError(errorCode.value()) == Continue::No;
    99100        });
    100101        if (shouldStopProcessing)

  • trunk/Source/WebCore/fileapi/NetworkSendQueue.h

    r249714 r262999  
    2626#pragma once
    2727
     28#include "ExceptionCode.h"
    2829#include <wtf/Deque.h>
    2930#include <wtf/Function.h>
    … …  
    4849    using WriteRawData = Function<void(const char*, size_t)>;
    4950    enum class Continue { No, Yes };
    50     using ProcessError = Function<Continue(int)>;
     51    using ProcessError = Function<Continue(ExceptionCode)>;
    5152    NetworkSendQueue(Document&, WriteString&&, WriteRawData&&, ProcessError&&);
    5253    ~NetworkSendQueue();

  • trunk/Source/WebCore/html/ImageBitmap.cpp

    r259830 r262999  
    3030#include "Blob.h"
    3131#include "CachedImage.h"
     32#include "ExceptionCode.h"
    3233#include "ExceptionOr.h"
    3334#include "FileReaderLoader.h"
    … …  
    598599    }
    599600
    600     void didFail(int) override
     601    void didFail(ExceptionCode) override
    601602    {
    602603        createImageBitmapAndResolvePromiseSoon(nullptr);

  • trunk/Source/WebKit/ChangeLog

    r262997 r262999  
     12020-06-13  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
     2
     3        Remove FileError.h
     4        https://bugs.webkit.org/show_bug.cgi?id=213119
     5
     6        Reviewed by Chris Dumez.
     7
     8        * WebProcess/Network/WebSocketChannel.cpp:
     9        (WebKit::WebSocketChannel::createMessageQueue):
     10
    1112020-06-12  Brian Burg  <bburg@apple.com>
    212

  • trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp

    r260063 r262999  
    3535#include <WebCore/Blob.h>
    3636#include <WebCore/Document.h>
     37#include <WebCore/ExceptionCode.h>
    3738#include <WebCore/Page.h>
    3839#include <WebCore/WebSocketChannel.h>
    … …  
    6364        channel.notifySendFrame(WebSocketFrame::OpCode::OpCodeBinary, data, byteLength);
    6465        channel.sendMessage(Messages::NetworkSocketChannel::SendData { IPC::DataReference { reinterpret_cast<const uint8_t*>(data), byteLength } }, byteLength);
    65     }, [&channel](auto errorCode) {
    66         channel.fail(makeString("Failed to load Blob: error code = ", errorCode));
     66    }, [&channel](ExceptionCode exceptionCode) {
     67        auto code = static_cast<int>(exceptionCode);
     68        channel.fail(makeString("Failed to load Blob: exception code = ", code));
    6769        return NetworkSendQueue::Continue::No;
    6870    } };
Note: See TracChangeset for help on using the changeset viewer.