[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9c19a120f8b93fccf4a22cc904ce3ca1742aa2b0
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 23:59:54 2009 +0000

            More Windows build fix.
    
            * platform/network/cf/CredentialStorageCFNet.cpp:
            (WebCore::CredentialStorage::getFromPersistentStorage):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9354c36..f96ad9e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-01  Alexey Proskuryakov  <ap at apple.com>
 
+        More Windows build fix.
+
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        (WebCore::CredentialStorage::getFromPersistentStorage):
+
+2009-12-01  Alexey Proskuryakov  <ap at apple.com>
+
         Windows build fix.
 
         * platform/network/cf/CredentialStorageCFNet.cpp: Include RetainPtr.h.
diff --git a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
index 97c89e2..0a9e36f 100644
--- a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
+++ b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
@@ -36,7 +36,8 @@ namespace WebCore {
 
 Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
 {
-    RetainPtr<CFURLCredentialRef> credentialCF(AdoptCF, wkCopyCredentialFromCFPersistentStorage(protectionSpace.get()));
+    RetainPtr<CFURLProtectionSpaceRef> protectionSpaceCF(AdoptCF, createCF(protectionSpace));
+    RetainPtr<CFURLCredentialRef> credentialCF(AdoptCF, wkCopyCredentialFromCFPersistentStorage(protectionSpaceCF.get()));
     return core(credentialCF.get());
 }
 

-- 
WebKit Debian packaging