Changeset 70467 in webkit

Timestamp:

Oct 25, 2010 11:41:29 AM (13 years ago)

Author:

weinig@apple.com

Message:

cancelledError for WebKit2 on windows should use kCFErrorDomainCFNetwork instead of webKitErrorDomain
​https://bugs.webkit.org/show_bug.cgi?id=48254

Reviewed by Dan Bernstein.

• WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:

(WebKit::cancelledError): Use kCFErrorDomainCFNetwork instead of webKitErrorDomain and switch over
to using kCFURLErrorCancelled instead of a hard coded constant.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/win/WebErrorsWin.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-25  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        cancelledError for WebKit2 on windows should use kCFErrorDomainCFNetwork instead of webKitErrorDomain
+        https://bugs.webkit.org/show_bug.cgi?id=48254
+
+        * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
+        (WebKit::cancelledError): Use kCFErrorDomainCFNetwork instead of webKitErrorDomain and switch over
+        to using kCFURLErrorCancelled instead of a hard coded constant.
+
 2010-10-25  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp

@@ -28 +28 @@
 #include "WKError.h"
 #include "WebError.h"
+#include <CFNetwork/CFNetworkErrors.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
@@ -35 +36 @@
 namespace WebKit {
 
-enum {
-    WebURLErrorCancelled =                       -999,
-};
-
 ResourceError cancelledError(const ResourceRequest& request)
 {
-    return ResourceError(WebError::webKitErrorDomain(), WebURLErrorCancelled, request.url().string(), String());
+    return ResourceError(kCFErrorDomainCFNetwork, kCFURLErrorCancelled, request.url().string(), String());
 }