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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 556e58e3040ddeb5bd453ee3c0f9711e15a9826b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 02:20:27 2010 +0000

    Add a didFail WKContextDownloadClient callback
    https://bugs.webkit.org/show_bug.cgi?id=49847
    
    Reviewed by Sam Weinig.
    
    * UIProcess/API/C/WKContext.h:
    Add didFail callback.
    
    * UIProcess/Downloads/DownloadProxy.cpp:
    (WebKit::DownloadProxy::didFail):
    Call WebDownloadClient::didFail.
    
    * UIProcess/WebDownloadClient.cpp:
    (WebKit::WebDownloadClient::didFail):
    Call the didFail client function.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2c45ca4..417dc44 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,25 @@
 
         Reviewed by Sam Weinig.
 
+        Add a didFail WKContextDownloadClient callback
+        https://bugs.webkit.org/show_bug.cgi?id=49847
+
+        * UIProcess/API/C/WKContext.h:
+        Add didFail callback.
+
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        (WebKit::DownloadProxy::didFail):
+        Call WebDownloadClient::didFail.
+
+        * UIProcess/WebDownloadClient.cpp:
+        (WebKit::WebDownloadClient::didFail):
+        Call the didFail client function.
+
+
+2010-11-19  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Extend sandbox when downloading files
         https://bugs.webkit.org/show_bug.cgi?id=49844
 
diff --git a/WebKit2/UIProcess/API/C/WKContext.h b/WebKit2/UIProcess/API/C/WKContext.h
index cdad0ff..90ca8e9 100644
--- a/WebKit2/UIProcess/API/C/WKContext.h
+++ b/WebKit2/UIProcess/API/C/WKContext.h
@@ -77,6 +77,7 @@ typedef bool (*WKContextDownloadShouldDecodeSourceDataOfMIMETypeCallback)(WKCont
 typedef WKStringRef (*WKContextDownloadDecideDestinationWithSuggestedFilenameCallback)(WKContextRef context, WKDownloadRef download, WKStringRef filename, bool* allowOverwrite, const void *clientInfo);
 typedef void (*WKContextDownloadDidCreateDestinationCallback)(WKContextRef context, WKDownloadRef download, WKStringRef path, const void *clientInfo);
 typedef void (*WKContextDownloadDidFinishCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo);
+typedef void (*WKContextDownloadDidFailCallback)(WKContextRef context, WKDownloadRef download, WKErrorRef error, const void *clientInfo);
 
 struct WKContextDownloadClient {
     int                                                                 version;
@@ -88,6 +89,7 @@ struct WKContextDownloadClient {
     WKContextDownloadDecideDestinationWithSuggestedFilenameCallback     decideDestinationWithSuggestedFilename;
     WKContextDownloadDidCreateDestinationCallback                       didCreateDestination;
     WKContextDownloadDidFinishCallback                                  didFinish;
+    WKContextDownloadDidFailCallback                                    didFail;
 };
 typedef struct WKContextDownloadClient WKContextDownloadClient;
 
diff --git a/WebKit2/UIProcess/Downloads/DownloadProxy.cpp b/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
index 7dd2a4e..2e1343c 100644
--- a/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
+++ b/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
@@ -122,9 +122,12 @@ void DownloadProxy::didFinish()
     m_webContext->downloadClient().didFinish(m_webContext, this);
 }
 
-void DownloadProxy::didFail(const ResourceError&)
+void DownloadProxy::didFail(const ResourceError& error)
 {
-    // FIXME: Implement.
+    if (!m_webContext)
+        return;
+
+    m_webContext->downloadClient().didFail(m_webContext, this, error);
 }
 
 } // namespace WebKit
diff --git a/WebKit2/UIProcess/WebDownloadClient.cpp b/WebKit2/UIProcess/WebDownloadClient.cpp
index a8e7798..7e69d96 100644
--- a/WebKit2/UIProcess/WebDownloadClient.cpp
+++ b/WebKit2/UIProcess/WebDownloadClient.cpp
@@ -88,6 +88,14 @@ void WebDownloadClient::didFinish(WebContext* webContext, DownloadProxy* downloa
         return;
     
     m_client.didFinish(toAPI(webContext), toAPI(downloadProxy), m_client.clientInfo);
-}    
+}
+
+void WebDownloadClient::didFail(WebContext* webContext, DownloadProxy* downloadProxy, const ResourceError& error)
+{
+    if (!m_client.didFail)
+        return;
+
+    m_client.didFail(toAPI(webContext), toAPI(downloadProxy), toAPI(error), m_client.clientInfo);
+}
 
 } // namespace WebKit
diff --git a/WebKit2/UIProcess/WebDownloadClient.h b/WebKit2/UIProcess/WebDownloadClient.h
index adf1879..7c75605 100644
--- a/WebKit2/UIProcess/WebDownloadClient.h
+++ b/WebKit2/UIProcess/WebDownloadClient.h
@@ -31,6 +31,7 @@
 #include <wtf/Forward.h>
 
 namespace WebCore {
+    class ResourceError;
     class ResourceResponse;
 }
 
@@ -48,6 +49,7 @@ public:
     String decideDestinationWithSuggestedFilename(WebContext*, DownloadProxy*, const String& filename, bool& allowOverwrite);
     void didCreateDestination(WebContext*, DownloadProxy*, const String& path);
     void didFinish(WebContext*, DownloadProxy*);
+    void didFail(WebContext*, DownloadProxy*, const WebCore::ResourceError&);
 };
 
 } // namespace WebKit

-- 
WebKit Debian packaging