Changeset 218244 in webkit


Ignore:
Timestamp:
Jun 13, 2017 11:31:11 PM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Do not mix C and C++ API error constants
​https://bugs.webkit.org/show_bug.cgi?id=173311

Reviewed by Alex Christensen.

In r214934 I added error constants to API::Error, but not for all errors exposed in the C API. Because of this
we are mixing both constants in WebErrors and in GTk+ WebKitPrivate.

  • Shared/API/APIError.h:
  • Shared/WebErrors.cpp:

(WebKit::blockedError):
(WebKit::blockedByContentBlockerError):
(WebKit::cannotShowURLError):
(WebKit::interruptedForPolicyChangeError):
(WebKit::blockedByContentFilterError):
(WebKit::cannotShowMIMETypeError):
(WebKit::pluginWillHandleLoadError):
(WebKit::internalError):

  • UIProcess/API/gtk/WebKitPrivate.cpp:

(toWebKitError):
(toWebCoreError):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r218229 r218244  
     12017-06-13  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Do not mix C and C++ API error constants
     4        https://bugs.webkit.org/show_bug.cgi?id=173311
     5
     6        Reviewed by Alex Christensen.
     7
     8        In r214934 I added error constants to API::Error, but not for all errors exposed in the C API. Because of this
     9        we are mixing both constants in WebErrors and in GTk+ WebKitPrivate.
     10
     11        * Shared/API/APIError.h:
     12        * Shared/WebErrors.cpp:
     13        (WebKit::blockedError):
     14        (WebKit::blockedByContentBlockerError):
     15        (WebKit::cannotShowURLError):
     16        (WebKit::interruptedForPolicyChangeError):
     17        (WebKit::blockedByContentFilterError):
     18        (WebKit::cannotShowMIMETypeError):
     19        (WebKit::pluginWillHandleLoadError):
     20        (WebKit::internalError):
     21        * UIProcess/API/gtk/WebKitPrivate.cpp:
     22        (toWebKitError):
     23        (toWebCoreError):
     24
    1252017-06-13  Matt Rajca  <mrajca@apple.com>
    226

  • trunk/Source/WebKit2/Shared/API/APIError.h

    r214934 r218244  
    4949    }
    5050
     51    enum General {
     52        Internal = 300
     53    };
    5154    static const WTF::String& webKitErrorDomain();
    52     enum Network { Cancelled = 302, FileDoesNotExist = 303 };
     55
     56    enum Network {
     57        Cancelled = 302,
     58        FileDoesNotExist = 303
     59    };
    5360    static const WTF::String& webKitNetworkErrorDomain();
     61
     62    enum Policy {
     63        CannotShowMIMEType = 100,
     64        CannotShowURL = 101,
     65        FrameLoadInterruptedByPolicyChange = 102,
     66        CannotUseRestrictedPort = 103,
     67        FrameLoadBlockedByContentBlocker = 104,
     68        FrameLoadBlockedByContentFilter = 105
     69    };
    5470    static const WTF::String& webKitPolicyErrorDomain();
     71
     72    enum Plugin {
     73        CannotFindPlugIn = 200,
     74        CannotLoadPlugIn = 201,
     75        JavaUnavailable = 202,
     76        PlugInCancelledConnection = 203,
     77        PlugInWillHandleLoad = 204,
     78        InsecurePlugInVersion = 205
     79    };
    5580    static const WTF::String& webKitPluginErrorDomain();
     81
    5682#if USE(SOUP)
    57     enum Download { Transport = 499, CancelledByUser = 400, Destination = 401 };
     83    enum Download {
     84        Transport = 499,
     85        CancelledByUser = 400,
     86        Destination = 401
     87    };
    5888    static const WTF::String& webKitDownloadErrorDomain();
    5989#endif
     90
    6091#if PLATFORM(GTK)
    61     enum Print { General = 599, PrinterNotFound = 500, InvalidPageRange = 501 };
     92    enum Print {
     93        General = 599,
     94        PrinterNotFound = 500,
     95        InvalidPageRange = 501
     96    };
    6297    static const WTF::String& webKitPrintErrorDomain();
    6398#endif
    64 
    6599
    66100    const WTF::String& domain() const { return m_platformError.domain(); }

  • trunk/Source/WebKit2/Shared/WebErrors.cpp

    r214934 r218244  
    2828
    2929#include "APIError.h"
    30 #include "WKErrorRef.h"
    3130#include <WebCore/LocalizedStrings.h>
    3231#include <WebCore/ResourceRequest.h>
    … …  
    3938ResourceError blockedError(const ResourceRequest& request)
    4039{
    41     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
     40    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::CannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
    4241}
    4342
    4443ResourceError blockedByContentBlockerError(const ResourceRequest& request)
    4544{
    46     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
     45    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
    4746}
    4847
    4948ResourceError cannotShowURLError(const ResourceRequest& request)
    5049{
    51     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
     50    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::CannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
    5251}
    5352
    5453ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5554{
    56     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
     55    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
    5756}
    5857
    … …  
    6059ResourceError blockedByContentFilterError(const ResourceRequest& request)
    6160{
    62     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
     61    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
    6362}
    6463#endif
    … …  
    6665ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    6766{
    68     return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
     67    return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::CannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
    6968}
    7069
    7170ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    7271{
    73     return ResourceError(API::Error::webKitPluginErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
     72    return ResourceError(API::Error::webKitPluginErrorDomain(), API::Error::Plugin::PlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
    7473}
    7574
    7675ResourceError internalError(const URL& url)
    7776{
    78     return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
     77    return ResourceError(API::Error::webKitErrorDomain(), API::Error::General::Internal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
    7978}
    8079

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp

    r218176 r218244  
    2222
    2323#include "APIError.h"
    24 #include "WKErrorRef.h"
    2524#include "WebEvent.h"
    2625#include "WebKitError.h"
    … …  
    8786    case API::Error::Network::FileDoesNotExist:
    8887        return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
    89     case kWKErrorCodeCannotShowMIMEType:
     88    case API::Error::Policy::CannotShowMIMEType:
    9089        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
    91     case kWKErrorCodeCannotShowURL:
     90    case API::Error::Policy::CannotShowURL:
    9291        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
    93     case kWKErrorCodeFrameLoadInterruptedByPolicyChange:
     92    case API::Error::Policy::FrameLoadInterruptedByPolicyChange:
    9493        return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
    95     case kWKErrorCodeCannotUseRestrictedPort:
     94    case API::Error::Policy::CannotUseRestrictedPort:
    9695        return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
    97     case kWKErrorCodeCannotFindPlugIn:
     96    case API::Error::Plugin::CannotFindPlugIn:
    9897        return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
    99     case kWKErrorCodeCannotLoadPlugIn:
     98    case API::Error::Plugin::CannotLoadPlugIn:
    10099        return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
    101     case kWKErrorCodeJavaUnavailable:
     100    case API::Error::Plugin::JavaUnavailable:
    102101        return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
    103     case kWKErrorCodePlugInCancelledConnection:
     102    case API::Error::Plugin::PlugInCancelledConnection:
    104103        return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
    105     case kWKErrorCodePlugInWillHandleLoad:
     104    case API::Error::Plugin::PlugInWillHandleLoad:
    106105        return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
    107106    case API::Error::Download::Transport:
    … …  
    131130        return API::Error::Network::FileDoesNotExist;
    132131    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
    133         return kWKErrorCodeCannotShowMIMEType;
     132        return API::Error::Policy::CannotShowMIMEType;
    134133    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
    135         return kWKErrorCodeCannotShowURL;
     134        return API::Error::Policy::CannotShowURL;
    136135    case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
    137         return kWKErrorCodeFrameLoadInterruptedByPolicyChange;
     136        return API::Error::Policy::FrameLoadInterruptedByPolicyChange;
    138137    case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
    139         return kWKErrorCodeCannotUseRestrictedPort;
     138        return API::Error::Policy::CannotUseRestrictedPort;
    140139    case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
    141         return kWKErrorCodeCannotFindPlugIn;
     140        return API::Error::Plugin::CannotFindPlugIn;
    142141    case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
    143         return kWKErrorCodeCannotLoadPlugIn;
     142        return API::Error::Plugin::CannotLoadPlugIn;
    144143    case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
    145         return kWKErrorCodeJavaUnavailable;
     144        return API::Error::Plugin::JavaUnavailable;
    146145    case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
    147         return kWKErrorCodePlugInCancelledConnection;
     146        return API::Error::Plugin::PlugInCancelledConnection;
    148147    case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
    149         return kWKErrorCodePlugInWillHandleLoad;
     148        return API::Error::Plugin::PlugInWillHandleLoad;
    150149    case WEBKIT_DOWNLOAD_ERROR_NETWORK:
    151150        return API::Error::Download::Transport;
Note: See TracChangeset for help on using the changeset viewer.