[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 5d2dbc5ceb784d3d8b5f528c26954e55062666f8
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 00:38:43 2010 +0000

            Chromium build fix.
    
            Updated for the removal of "mightDownloadFromHandle".
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3c651ba..e4eb306 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-08  Alexey Proskuryakov  <ap at apple.com>
+
+        Chromium build fix.
+
+        Updated for the removal of "mightDownloadFromHandle".
+
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::ResourceHandle):
+        (WebCore::ResourceHandle::create):
+
 2010-03-08  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/ResourceHandle.cpp b/WebKit/chromium/src/ResourceHandle.cpp
index ee08ab4..206823c 100644
--- a/WebKit/chromium/src/ResourceHandle.cpp
+++ b/WebKit/chromium/src/ResourceHandle.cpp
@@ -159,8 +159,7 @@ void ResourceHandleInternal::didFail(WebURLLoader*, const WebURLError& error)
 ResourceHandle::ResourceHandle(const ResourceRequest& request,
                                ResourceHandleClient* client,
                                bool defersLoading,
-                               bool shouldContentSniff,
-                               bool mightDownloadFromHandle)
+                               bool shouldContentSniff)
     : d(new ResourceHandleInternal(request, client))
 {
     d->m_owner = this;
@@ -172,11 +171,10 @@ PassRefPtr<ResourceHandle> ResourceHandle::create(const ResourceRequest& request
                                                   ResourceHandleClient* client,
                                                   Frame* deprecated,
                                                   bool defersLoading,
-                                                  bool shouldContentSniff,
-                                                  bool mightDownloadFromHandle)
+                                                  bool shouldContentSniff)
 {
     RefPtr<ResourceHandle> newHandle = adoptRef(new ResourceHandle(
-        request, client, defersLoading, shouldContentSniff, mightDownloadFromHandle));
+        request, client, defersLoading, shouldContentSniff));
 
     if (newHandle->start(deprecated))
         return newHandle.release();

-- 
WebKit Debian packaging