[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit edef10c7d403a8963aa06c418feb29efa4eee431
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 18:41:29 2010 +0000

    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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8813f51..c4498e3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-10-25  Sam Weinig  <sam at 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 at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         Need WebKit2 API to figure out if a frame can provide source
diff --git a/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp b/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
index aeda10d..0fb4559 100644
--- a/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp
@@ -27,6 +27,7 @@
 
 #include "WKError.h"
 #include "WebError.h"
+#include <CFNetwork/CFNetworkErrors.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 
@@ -34,13 +35,9 @@ using namespace WebCore;
 
 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());
 }
 
 ResourceError blockedError(const ResourceRequest& request)

-- 
WebKit Debian packaging