diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp index 7f2e74ce8..db024165d 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp @@ -27,22 +27,21 @@ #include "config.h" #include "WebErrors.h" -#include "WKError.h" -#include "WebError.h" +#include "APIError.h" +#include "WKErrorRef.h" +#include <QCoreApplication> +#include <QNetworkReply> #include <WebCore/ResourceError.h> #include <WebCore/ResourceRequest.h> #include <WebCore/ResourceResponse.h> -#include <QCoreApplication> -#include <QNetworkReply> - using namespace WebCore; namespace WebKit { ResourceError cancelledError(const ResourceRequest& request) { - ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(), + ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url(), QCoreApplication::translate("QWebFrame", "Request cancelled")); error.setIsCancellation(true); return error; @@ -50,38 +49,50 @@ ResourceError cancelledError(const ResourceRequest& request) ResourceError blockedError(const ResourceRequest& request) { - return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(), + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(), QCoreApplication::translate("QWebFrame", "Request blocked")); } +ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest& request) +{ + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(), + QCoreApplication::translate("QWebFrame", "The URL was blocked by a content blocker")); +} + ResourceError cannotShowURLError(const ResourceRequest& request) { - return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(), + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url(), QCoreApplication::translate("QWebFrame", "Cannot show URL")); } ResourceError interruptedForPolicyChangeError(const ResourceRequest& request) { - return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change")); } ResourceError cannotShowMIMETypeError(const ResourceResponse& response) { - return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(), + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(), QCoreApplication::translate("QWebFrame", "Cannot show mimetype")); } ResourceError fileDoesNotExistError(const ResourceResponse& response) { - return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(), + return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url(), QCoreApplication::translate("QWebFrame", "File does not exist")); } ResourceError pluginWillHandleLoadError(const ResourceResponse& response) { - return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(), + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(), QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine")); } +ResourceError internalError(const WebCore::URL& url) +{ + return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, + QCoreApplication::translate("QWebFrame", "WebKit encountered an internal error")); +} + } // namespace WebKit |