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

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8b4fdecab609315dd60dda2712eac91c25e335cc
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 18:56:58 2010 +0000

            Tiger and Gtk build fixes.
    
            https://bugs.webkit.org/show_bug.cgi?id=42201
            Use ResourceHandle object for synchronous loading
    
            * platform/network/mac/ResourceHandleMac.mm:
            (WebCore::ResourceHandle::createNSURLConnection):
            (WebCore::ResourceHandle::loadResourceSynchronously):
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::startHttp):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63340 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 237f701..a540f77 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-14  Alexey Proskuryakov  <ap at apple.com>
+
+        Tiger and Gtk build fixes.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42201
+        Use ResourceHandle object for synchronous loading
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::createNSURLConnection):
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::startHttp):
+
 2010-07-14  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/mac/ResourceHandleMac.mm b/WebCore/platform/network/mac/ResourceHandleMac.mm
index 6eb884e..eee0311 100644
--- a/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -254,6 +254,7 @@ void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredential
 #else
     // Building on Tiger. Don't use WebCore credential storage, don't try to disable content sniffing.
     UNUSED_PARAM(shouldUseCredentialStorage);
+    UNUSED_PARAM(shouldContentSniff);
     d->m_connection.adoptNS([[NSURLConnection alloc] initWithRequest:firstRequest().nsURLRequest() delegate:delegate]);
 #endif
 }
@@ -499,10 +500,9 @@ void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, S
 
 #else
     UNUSED_PARAM(storedCredentials);
-    NSURLRequest *nsRequest = mutableRequest ? mutableRequest : request.nsURLRequest();
-
+    UNUSED_PARAM(frame);
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    result = [NSURLConnection sendSynchronousRequest:nsRequest returningResponse:&nsURLResponse error:&nsError];
+    result = [NSURLConnection sendSynchronousRequest:request.nsURLRequest() returningResponse:&nsURLResponse error:&nsError];
     END_BLOCK_OBJC_EXCEPTIONS;
 #endif
 
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index b94b4a8..96a2f25 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -512,7 +512,7 @@ static bool startHttp(ResourceHandle* handle)
         if (numElements < 2) {
             Vector<char> body;
             httpBody->flatten(body);
-            soup_message_set_request(d->m_msg, firstRequest().httpContentType().utf8().data(),
+            soup_message_set_request(d->m_msg, d->m_firstRequest.httpContentType().utf8().data(),
                                      SOUP_MEMORY_COPY, body.data(), body.size());
         } else {
             /*

-- 
WebKit Debian packaging