Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=32036
        Implement CredentialStorage::getFromPersistentStorage for CFNetwork

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76822ac0f05e2b317f7a9965ca781f47d443acc5..bfa84266ca60964bfc2af4d4d9dd18988b1a77f1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32036
+        Implement CredentialStorage::getFromPersistentStorage for CFNetwork
+
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        (WebCore::CredentialStorage::getFromPersistentStorage):
+
 2009-12-01  Daniel Bates  <dbates@webkit.org>
 
         Reviewed by Pavel Feldman.

diff --git a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
index ef7a501b3fbdae1a8c534fa4ea5f7a64e74ffe0f..3248e40cfab4cd33f94c61efe21c47e725c324c6 100644 (file)
--- a/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
+++ b/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
@@ -26,17 +26,17 @@
 #include "config.h"
 #include "CredentialStorage.h"
 
+#include "AuthenticationCF.h"
 #include "Credential.h"
-#include "NotImplemented.h"
 #include "ProtectionSpace.h"
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
 
 namespace WebCore {
 
 Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
 {
-    UNUSED_PARAM(protectionSpace);
-    notImplemented();
-    return Credential();
+    RetainPtr<CFURLCredentialRef> credentialCF(AdoptCF, wkCopyCredentialFromCFPersistentStorage(protectionSpace.get()));
+    return core(credentialCF.get());
 }
 
 } // namespace WebCore

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index b9a4fbdd4cbe402267d5dd63304734b9ce80f554..a9ab2769d54b8f34399b238c826e11bfea7813c2 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32036
+        Implement CredentialStorage::getFromPersistentStorage for CFNetwork
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+        Update WebKitSystemInterface.
+
 2009-11-24  Alexey Proskuryakov  <ap@apple.com>
 
         Reviewed by Brady Eidson.

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 91e09031ef981a3de0d27fb91a16fc9ced8cc089..e3feae62ea8178817ba328802fa0c5b5b0a2dc5e 100644 (file)
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -47,6 +47,7 @@ typedef struct __CFHTTPMessage* CFHTTPMessageRef;
 typedef const struct __CFNumber* CFNumberRef;
 typedef struct __CFReadStream* CFReadStreamRef;
 typedef const struct __CFURL* CFURLRef;
+typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
 
 void wkSetFontSmoothingLevel(int type);
 int wkGetFontSmoothingLevel();
@@ -86,6 +87,8 @@ void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber
 void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
 
+CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef);
+
 CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
 
 #endif // WebKitSystemInterface_h

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 25c1332b908f0f2c692f6baf74de21bb9b795dcc..60d4e1e2fc781e68a75df9f102273e7da7a767e3 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 236bc9856b594ccc731db0db8fe266d23504f7e3..56cbdcf276e73ce2e9f68b9da973499a22e3ae73 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ