Modified: trunk/Source/WebKit2/Shared/API/APIError.h (218243 => 218244)
--- trunk/Source/WebKit2/Shared/API/APIError.h 2017-06-14 04:55:04 UTC (rev 218243)
+++ trunk/Source/WebKit2/Shared/API/APIError.h 2017-06-14 06:31:11 UTC (rev 218244)
@@ -48,21 +48,55 @@
return adoptRef(*new Error(error));
}
+ enum General {
+ Internal = 300
+ };
static const WTF::String& webKitErrorDomain();
- enum Network { Cancelled = 302, FileDoesNotExist = 303 };
+
+ enum Network {
+ Cancelled = 302,
+ FileDoesNotExist = 303
+ };
static const WTF::String& webKitNetworkErrorDomain();
+
+ enum Policy {
+ CannotShowMIMEType = 100,
+ CannotShowURL = 101,
+ FrameLoadInterruptedByPolicyChange = 102,
+ CannotUseRestrictedPort = 103,
+ FrameLoadBlockedByContentBlocker = 104,
+ FrameLoadBlockedByContentFilter = 105
+ };
static const WTF::String& webKitPolicyErrorDomain();
+
+ enum Plugin {
+ CannotFindPlugIn = 200,
+ CannotLoadPlugIn = 201,
+ JavaUnavailable = 202,
+ PlugInCancelledConnection = 203,
+ PlugInWillHandleLoad = 204,
+ InsecurePlugInVersion = 205
+ };
static const WTF::String& webKitPluginErrorDomain();
+
#if USE(SOUP)
- enum Download { Transport = 499, CancelledByUser = 400, Destination = 401 };
+ enum Download {
+ Transport = 499,
+ CancelledByUser = 400,
+ Destination = 401
+ };
static const WTF::String& webKitDownloadErrorDomain();
#endif
+
#if PLATFORM(GTK)
- enum Print { General = 599, PrinterNotFound = 500, InvalidPageRange = 501 };
+ enum Print {
+ General = 599,
+ PrinterNotFound = 500,
+ InvalidPageRange = 501
+ };
static const WTF::String& webKitPrintErrorDomain();
#endif
-
const WTF::String& domain() const { return m_platformError.domain(); }
int errorCode() const { return m_platformError.errorCode(); }
const WTF::String& failingURL() const { return m_platformError.failingURL(); }
Modified: trunk/Source/WebKit2/Shared/WebErrors.cpp (218243 => 218244)
--- trunk/Source/WebKit2/Shared/WebErrors.cpp 2017-06-14 04:55:04 UTC (rev 218243)
+++ trunk/Source/WebKit2/Shared/WebErrors.cpp 2017-06-14 06:31:11 UTC (rev 218244)
@@ -27,7 +27,6 @@
#include "WebErrors.h"
#include "APIError.h"
-#include "WKErrorRef.h"
#include <WebCore/LocalizedStrings.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
@@ -38,44 +37,44 @@
ResourceError blockedError(const ResourceRequest& request)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::CannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
}
ResourceError blockedByContentBlockerError(const ResourceRequest& request)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadBlockedByContentBlocker, request.url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description"));
}
ResourceError cannotShowURLError(const ResourceRequest& request)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::CannotShowURL, request.url(), WEB_UI_STRING("The URL can’t be shown", "WebKitErrorCannotShowURL description"));
}
ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
}
#if ENABLE(CONTENT_FILTERING)
ResourceError blockedByContentFilterError(const ResourceRequest& request)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
+ return ResourceError(API::Error::webKitPolicyErrorDomain(), API::Error::Policy::FrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorFrameLoadBlockedByContentFilter description"));
}
#endif
ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
{
- return ResourceError(API::Error::webKitPolicyErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can’t be shown", "WebKitErrorCannotShowMIMEType description"));
+ 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"));
}
ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
{
- return ResourceError(API::Error::webKitPluginErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
+ return ResourceError(API::Error::webKitPluginErrorDomain(), API::Error::Plugin::PlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
}
ResourceError internalError(const URL& url)
{
- return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
+ return ResourceError(API::Error::webKitErrorDomain(), API::Error::General::Internal, url, WEB_UI_STRING("WebKit encountered an internal error", "WebKitErrorInternal description"));
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (218243 => 218244)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-06-14 04:55:04 UTC (rev 218243)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2017-06-14 06:31:11 UTC (rev 218244)
@@ -21,7 +21,6 @@
#include "WebKitPrivate.h"
#include "APIError.h"
-#include "WKErrorRef.h"
#include "WebEvent.h"
#include "WebKitError.h"
#include <gdk/gdk.h>
@@ -86,23 +85,23 @@
return WEBKIT_NETWORK_ERROR_CANCELLED;
case API::Error::Network::FileDoesNotExist:
return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
- case kWKErrorCodeCannotShowMIMEType:
+ case API::Error::Policy::CannotShowMIMEType:
return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
- case kWKErrorCodeCannotShowURL:
+ case API::Error::Policy::CannotShowURL:
return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
- case kWKErrorCodeFrameLoadInterruptedByPolicyChange:
+ case API::Error::Policy::FrameLoadInterruptedByPolicyChange:
return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
- case kWKErrorCodeCannotUseRestrictedPort:
+ case API::Error::Policy::CannotUseRestrictedPort:
return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
- case kWKErrorCodeCannotFindPlugIn:
+ case API::Error::Plugin::CannotFindPlugIn:
return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
- case kWKErrorCodeCannotLoadPlugIn:
+ case API::Error::Plugin::CannotLoadPlugIn:
return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
- case kWKErrorCodeJavaUnavailable:
+ case API::Error::Plugin::JavaUnavailable:
return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
- case kWKErrorCodePlugInCancelledConnection:
+ case API::Error::Plugin::PlugInCancelledConnection:
return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
- case kWKErrorCodePlugInWillHandleLoad:
+ case API::Error::Plugin::PlugInWillHandleLoad:
return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
case API::Error::Download::Transport:
return WEBKIT_DOWNLOAD_ERROR_NETWORK;
@@ -130,23 +129,23 @@
case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
return API::Error::Network::FileDoesNotExist;
case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
- return kWKErrorCodeCannotShowMIMEType;
+ return API::Error::Policy::CannotShowMIMEType;
case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
- return kWKErrorCodeCannotShowURL;
+ return API::Error::Policy::CannotShowURL;
case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
- return kWKErrorCodeFrameLoadInterruptedByPolicyChange;
+ return API::Error::Policy::FrameLoadInterruptedByPolicyChange;
case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
- return kWKErrorCodeCannotUseRestrictedPort;
+ return API::Error::Policy::CannotUseRestrictedPort;
case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
- return kWKErrorCodeCannotFindPlugIn;
+ return API::Error::Plugin::CannotFindPlugIn;
case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
- return kWKErrorCodeCannotLoadPlugIn;
+ return API::Error::Plugin::CannotLoadPlugIn;
case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
- return kWKErrorCodeJavaUnavailable;
+ return API::Error::Plugin::JavaUnavailable;
case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
- return kWKErrorCodePlugInCancelledConnection;
+ return API::Error::Plugin::PlugInCancelledConnection;
case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
- return kWKErrorCodePlugInWillHandleLoad;
+ return API::Error::Plugin::PlugInWillHandleLoad;
case WEBKIT_DOWNLOAD_ERROR_NETWORK:
return API::Error::Download::Transport;
case WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER:
