[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:45:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0a0c69feac65559a04ce605fedb2fc870be6b9e7
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 19 17:15:16 2010 +0000
Part 2 of:
Need to include WKErrorRef in the WKPageDidFail... functions
<rdar://problem/8564110>
https://bugs.webkit.org/show_bug.cgi?id=47871
Reviewed by Anders Carlsson.
* Shared/API/c/WKError.cpp:
(WKErrorCopyWKErrorDomain):
* Shared/API/c/WKError.h:
* Shared/WebError.cpp: Added.
(WebKit::WebError::webKitErrorDomain):
* Shared/WebError.h:
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
(+[NSError _webKitErrorWithCode:failingURL:]):
(registerErrors):
(WebKit::blockedError):
(WebKit::cannotShowURLError):
(WebKit::interruptForPolicyChangeError):
(WebKit::cannotShowMIMETypeError):
* WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
(WebKit::cancelledError):
(WebKit::blockedError):
(WebKit::cannotShowURLError):
(WebKit::interruptForPolicyChangeError):
* win/WebKit2.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6d7aa0a..aa29174 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,36 @@
2010-10-19 Sam Weinig <sam at webkit.org>
+ Reviewed by Anders Carlsson.
+
+ Part 2 of:
+ Need to include WKErrorRef in the WKPageDidFail... functions
+ <rdar://problem/8564110>
+ https://bugs.webkit.org/show_bug.cgi?id=47871
+
+ * Shared/API/c/WKError.cpp:
+ (WKErrorCopyWKErrorDomain):
+ * Shared/API/c/WKError.h:
+ * Shared/WebError.cpp: Added.
+ (WebKit::WebError::webKitErrorDomain):
+ * Shared/WebError.h:
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+ (+[NSError _webKitErrorWithCode:failingURL:]):
+ (registerErrors):
+ (WebKit::blockedError):
+ (WebKit::cannotShowURLError):
+ (WebKit::interruptForPolicyChangeError):
+ (WebKit::cannotShowMIMETypeError):
+ * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
+ (WebKit::cancelledError):
+ (WebKit::blockedError):
+ (WebKit::cannotShowURLError):
+ (WebKit::interruptForPolicyChangeError):
+ * win/WebKit2.vcproj:
+
+2010-10-19 Sam Weinig <sam at webkit.org>
+
Reviewed by Dan Bernstein.
Need to include WKErrorRef in the WKPageDidFail... functions
diff --git a/WebKit2/Shared/API/c/WKError.cpp b/WebKit2/Shared/API/c/WKError.cpp
index 87512e0..395cf3a 100644
--- a/WebKit2/Shared/API/c/WKError.cpp
+++ b/WebKit2/Shared/API/c/WKError.cpp
@@ -35,6 +35,11 @@ WKTypeID WKErrorGetTypeID()
return toAPI(WebError::APIType);
}
+WKStringRef WKErrorCopyWKErrorDomain()
+{
+ return toCopiedAPI(WebError::webKitErrorDomain());
+}
+
WKStringRef WKErrorCopyDomain(WKErrorRef errorRef)
{
return toCopiedAPI(toImpl(errorRef)->domain());
diff --git a/WebKit2/Shared/API/c/WKError.h b/WebKit2/Shared/API/c/WKError.h
index dbc134e..6f1f4f3 100644
--- a/WebKit2/Shared/API/c/WKError.h
+++ b/WebKit2/Shared/API/c/WKError.h
@@ -32,8 +32,23 @@
extern "C" {
#endif
+enum {
+ kWKErrorCodeCannotShowMIMEType = 100,
+ kWKErrorCodeCannotShowURL = 101,
+ kWKErrorCodeFrameLoadInterruptedByPolicyChange = 102,
+ kWKErrorCodeCannotUseRestrictedPort = 103,
+ kWKErrorCodeCannotFindPlugIn = 200,
+ kWKErrorCodeCannotLoadPlugIn = 201,
+ kWKErrorCodeJavaUnavailable = 202,
+ kWKErrorCodePlugInCancelledConnection = 203,
+ kWKErrorCodePlugInWillHandleLoad = 204,
+};
+typedef uint32_t WKErrorCode;
+
WK_EXPORT WKTypeID WKErrorGetTypeID();
+WK_EXPORT WKStringRef WKErrorCopyWKErrorDomain();
+
WK_EXPORT WKStringRef WKErrorCopyDomain(WKErrorRef error);
WK_EXPORT int WKErrorGetErrorCode(WKErrorRef error);
WK_EXPORT WKURLRef WKErrorCopyFailingURL(WKErrorRef error);
diff --git a/WebKit2/Shared/WebError.cpp b/WebKit2/Shared/WebError.cpp
new file mode 100644
index 0000000..a401d71
--- /dev/null
+++ b/WebKit2/Shared/WebError.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "WebError.h"
+
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+const String& WebError::webKitErrorDomain()
+{
+ DEFINE_STATIC_LOCAL(String, webKitErrorDomainString, ("WebKitErrorDomain"));
+ return webKitErrorDomainString;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebError.h b/WebKit2/Shared/WebError.h
index c904cc6..9c5ddb0 100644
--- a/WebKit2/Shared/WebError.h
+++ b/WebKit2/Shared/WebError.h
@@ -48,6 +48,8 @@ public:
return adoptRef(new WebError(error));
}
+ static const String& webKitErrorDomain();
+
const String& domain() const { return m_platformError.domain(); }
int errorCode() const { return m_platformError.errorCode();; }
const String& failingURL() const { return m_platformError.failingURL(); }
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 797488c..4e96fae 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -210,6 +210,7 @@ HEADERS += \
Shared/VisitedLinkTable.h \
Shared/WebCertificateInfo.h \
Shared/WebEvent.h \
+ Shared/WebError.h \
Shared/WebEventConversion.h \
Shared/WebNavigationDataStore.h \
Shared/WebNumber.h \
@@ -359,6 +360,7 @@ SOURCES += \
Shared/qt/WebURLRequestQt.cpp \
Shared/qt/WebURLResponseQt.cpp \
Shared/VisitedLinkTable.cpp \
+ Shared/WebError.cpp \
Shared/WebEventConversion.cpp \
Shared/WebPageCreationParameters.cpp \
Shared/WebPopupItem.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 442c175..d7b654f 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -301,6 +301,7 @@
BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC574E611267D080006F0F12 /* WebPopupMenuProxy.h */; };
BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */; };
BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
+ BC575613126E0138006F0F12 /* WebError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* WebError.cpp */; };
BC59534210FC04520098F82D /* WebLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59534010FC04520098F82D /* WebLoaderClient.h */; };
BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
BC5F7BB41182376C0052C02C /* ChunkedUpdateDrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5F7BB21182376C0052C02C /* ChunkedUpdateDrawingArea.cpp */; };
@@ -786,6 +787,7 @@
BC574E611267D080006F0F12 /* WebPopupMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenuProxy.h; sourceTree = "<group>"; };
BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenuProxyMac.h; sourceTree = "<group>"; };
BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
+ BC575612126E0138006F0F12 /* WebError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebError.cpp; sourceTree = "<group>"; };
BC59534010FC04520098F82D /* WebLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLoaderClient.h; sourceTree = "<group>"; };
BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
BC5F7BB21182376C0052C02C /* ChunkedUpdateDrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChunkedUpdateDrawingArea.cpp; sourceTree = "<group>"; };
@@ -1200,6 +1202,7 @@
BCF50726124329AA005955AE /* WebCertificateInfo.h */,
BCBD3C3A125BFA7A00D2C29F /* StringPairVector.h */,
51578B821209ECEF00A37C4A /* WebData.h */,
+ BC575612126E0138006F0F12 /* WebError.cpp */,
516A4A5B120A2CCD00C05B7F /* WebError.h */,
BC032DAF10F4380F0058C15A /* WebEvent.h */,
BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
@@ -2381,6 +2384,7 @@
1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */,
1A91010B1268C8CA001842F5 /* FindIndicatorWindow.mm in Sources */,
F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
+ BC575613126E0138006F0F12 /* WebError.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm b/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
index d7ff44f..6076cb9 100644
--- a/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
+++ b/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
@@ -25,33 +25,17 @@
#include "WebErrors.h"
+#include "WKError.h"
+#include "WebError.h"
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
#include <pthread.h>
using namespace WebCore;
+using namespace WebKit;
// FIXME: We probably don't need to use NSErrors here.
-enum {
- WebKitErrorCannotShowMIMEType = 100,
- WebKitErrorCannotShowURL = 101,
- WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
-};
-enum {
- WebKitErrorCannotFindPlugIn = 200,
- WebKitErrorCannotLoadPlugIn = 201,
- WebKitErrorJavaUnavailable = 202,
-};
-enum {
- WebKitErrorCannotUseRestrictedPort = 103,
-};
-
-#define WebKitErrorPlugInCancelledConnection 203
-#define WebKitErrorPlugInWillHandleLoad 204
-
-static NSString *WebKitErrorDomain = @"WebKitErrorDomain";
-
static NSString * const WebKitErrorMIMETypeKey = @"WebKitErrorMIMETypeKey";
static NSString * const WebKitErrorPlugInNameKey = @"WebKitErrorPlugInNameKey";
static NSString * const WebKitErrorPlugInPageURLStringKey = @"WebKitErrorPlugInPageURLStringKey";
@@ -116,7 +100,7 @@ static NSMutableDictionary *descriptions = nil;
+ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URLString
{
- return [self _webKitErrorWithDomain:WebKitErrorDomain code:code URL:[NSURL URLWithString:URLString]];
+ return [self _webKitErrorWithDomain:WebError::webKitErrorDomain() code:code URL:[NSURL URLWithString:URLString]];
}
+ (void)_webkit_addErrorsWithCodesAndDescriptions:(NSDictionary *)dictionary inDomain:(NSString *)domain
@@ -133,20 +117,20 @@ static void registerErrors()
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
// Policy errors
- WebKitErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
- WebKitErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
- WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange, [NSNumber numberWithInt: WebKitErrorFrameLoadInterruptedByPolicyChange],
- WebKitErrorDescriptionCannotUseRestrictedPort, [NSNumber numberWithInt: WebKitErrorCannotUseRestrictedPort],
+ WebKitErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: kWKErrorCodeCannotShowMIMEType],
+ WebKitErrorDescriptionCannotShowURL, [NSNumber numberWithInt: kWKErrorCodeCannotShowURL],
+ WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange, [NSNumber numberWithInt: kWKErrorCodeFrameLoadInterruptedByPolicyChange],
+ WebKitErrorDescriptionCannotUseRestrictedPort, [NSNumber numberWithInt: kWKErrorCodeCannotUseRestrictedPort],
// Plug-in and java errors
- WebKitErrorDescriptionCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugIn],
- WebKitErrorDescriptionCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugIn],
- WebKitErrorDescriptionJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
- WebKitErrorDescriptionPlugInCancelledConnection, [NSNumber numberWithInt: WebKitErrorPlugInCancelledConnection],
- WebKitErrorDescriptionPlugInWillHandleLoad, [NSNumber numberWithInt: WebKitErrorPlugInWillHandleLoad],
+ WebKitErrorDescriptionCannotFindPlugin, [NSNumber numberWithInt: kWKErrorCodeCannotFindPlugIn],
+ WebKitErrorDescriptionCannotLoadPlugin, [NSNumber numberWithInt: kWKErrorCodeCannotLoadPlugIn],
+ WebKitErrorDescriptionJavaUnavailable, [NSNumber numberWithInt: kWKErrorCodeJavaUnavailable],
+ WebKitErrorDescriptionPlugInCancelledConnection, [NSNumber numberWithInt: kWKErrorCodePlugInCancelledConnection],
+ WebKitErrorDescriptionPlugInWillHandleLoad, [NSNumber numberWithInt: kWKErrorCodePlugInWillHandleLoad],
nil];
- [NSError _webkit_addErrorsWithCodesAndDescriptions:dict inDomain:WebKitErrorDomain];
+ [NSError _webkit_addErrorsWithCodesAndDescriptions:dict inDomain:WebError::webKitErrorDomain()];
[pool drain];
}
@@ -162,22 +146,22 @@ ResourceError cancelledError(const ResourceRequest& request)
ResourceError blockedError(const ResourceRequest& request)
{
- return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotUseRestrictedPort URL:request.url()];
+ return [NSError _webKitErrorWithDomain:WebError::webKitErrorDomain() code:kWKErrorCodeCannotUseRestrictedPort URL:request.url()];
}
ResourceError cannotShowURLError(const ResourceRequest& request)
{
- return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotShowURL URL:request.url()];
+ return [NSError _webKitErrorWithDomain:WebError::webKitErrorDomain() code:kWKErrorCodeCannotShowURL URL:request.url()];
}
ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
{
- return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];
+ return [NSError _webKitErrorWithDomain:WebError::webKitErrorDomain() code:kWKErrorCodeFrameLoadInterruptedByPolicyChange URL:request.url()];
}
ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
{
- return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:WebKitErrorCannotShowMIMEType URL:response.url()];
+ return [NSError _webKitErrorWithDomain:NSURLErrorDomain code:kWKErrorCodeCannotShowMIMEType URL:response.url()];
}
ResourceError fileDoesNotExistError(const ResourceResponse& response)
diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
index b8340bf..af19d58 100644
--- a/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
@@ -25,6 +25,8 @@
#include "WebErrors.h"
+#include "WKError.h"
+#include "WebError.h"
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
@@ -32,93 +34,28 @@ using namespace WebCore;
namespace WebKit {
-#define WebURLErrorDomain TEXT("CFURLErrorDomain")
-
enum {
- WebURLErrorUnknown = -1,
WebURLErrorCancelled = -999,
- WebURLErrorBadURL = -1000,
- WebURLErrorTimedOut = -1001,
- WebURLErrorUnsupportedURL = -1002,
- WebURLErrorCannotFindHost = -1003,
- WebURLErrorCannotConnectToHost = -1004,
- WebURLErrorNetworkConnectionLost = -1005,
- WebURLErrorDNSLookupFailed = -1006,
- WebURLErrorHTTPTooManyRedirects = -1007,
- WebURLErrorResourceUnavailable = -1008,
- WebURLErrorNotConnectedToInternet = -1009,
- WebURLErrorRedirectToNonExistentLocation = -1010,
- WebURLErrorBadServerResponse = -1011,
- WebURLErrorUserCancelledAuthentication = -1012,
- WebURLErrorUserAuthenticationRequired = -1013,
- WebURLErrorZeroByteResource = -1014,
- WebURLErrorFileDoesNotExist = -1100,
- WebURLErrorFileIsDirectory = -1101,
- WebURLErrorNoPermissionsToReadFile = -1102,
- WebURLErrorSecureConnectionFailed = -1200,
- WebURLErrorServerCertificateHasBadDate = -1201,
- WebURLErrorServerCertificateUntrusted = -1202,
- WebURLErrorServerCertificateHasUnknownRoot = -1203,
- WebURLErrorServerCertificateNotYetValid = -1204,
- WebURLErrorClientCertificateRejected = -1205,
- WebURLErrorClientCertificateRequired = -1206,
- WebURLErrorCannotLoadFromNetwork = -2000,
-
- // Download and file I/O errors
- WebURLErrorCannotCreateFile = -3000,
- WebURLErrorCannotOpenFile = -3001,
- WebURLErrorCannotCloseFile = -3002,
- WebURLErrorCannotWriteToFile = -3003,
- WebURLErrorCannotRemoveFile = -3004,
- WebURLErrorCannotMoveFile = -3005,
- WebURLErrorDownloadDecodingFailedMidStream = -3006,
- WebURLErrorDownloadDecodingFailedToComplete =-3007,
-};
-
-#define WebKitErrorDomain TEXT("WebKitErrorDomain")
-
-enum {
- WebKitErrorCannotShowMIMEType = 100,
- WebKitErrorCannotShowURL = 101,
- WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
- WebKitErrorCannotUseRestrictedPort = 103,
-};
-
-enum {
- WebKitErrorCannotFindPlugIn = 200,
- WebKitErrorCannotLoadPlugIn = 201,
- WebKitErrorJavaUnavailable = 202,
};
-enum {
- WebKitErrorGeolocationLocationUnknown = 300,
-};
-
-#define WebKitErrorMIMETypeKey TEXT("WebKitErrorMIMETypeKey")
-#define WebKitErrorPlugInNameKey TEXT("WebKitErrorPlugInNameKey")
-#define WebKitErrorPlugInPageURLStringKey TEXT("WebKitErrorPlugInPageURLStringKey")
-
-#define WebPOSIXErrorDomain TEXT("NSPOSIXErrorDomain")
-#define WebPOSIXErrorECONNRESET 54
-
ResourceError cancelledError(const ResourceRequest& request)
{
- return ResourceError(String(WebURLErrorDomain), WebURLErrorCancelled, request.url().string(), String());
+ return ResourceError(WebError::webKitErrorDomain(), WebURLErrorCancelled, request.url().string(), String());
}
ResourceError blockedError(const ResourceRequest& request)
{
- return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().string(), String());
+ return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(), String());
}
ResourceError cannotShowURLError(const ResourceRequest& request)
{
- return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), String());
+ return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(), String());
}
ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
{
- return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), String());
+ return ResourceError(WebError::webKitErrorDomain() kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), String());
}
ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index d20526f..13a26ea 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -497,6 +497,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebError.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebError.h"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list