Changeset 91200 in webkit

Timestamp:

Jul 18, 2011 11:55:56 AM (13 years ago)

Author:

psolanki@apple.com

Message:

Part of ​https://bugs.webkit.org/show_bug.cgi?id=63674
Get webkit to compile with USE(CFNETWORK) enabled on Mac

Reviewed by David Kilzer.

Get coookie storage code to work with USE(CFNETWORK) enabled on Mac.

No new tests because no change in functionality.

• platform/network/cf/CookieStorageCFNet.cpp:

(WebCore::defaultCookieStorage):
(WebCore::defaultSessionCookieStorage):

• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::ResourceHandle::createPrivateBrowsingStorageSession):

• platform/network/mac/CookieStorageMac.mm:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/CookieStorageCFNet.cpp (modified) (5 diffs)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (1 diff)
• platform/network/mac/CookieStorageMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Pratik Solanki  <psolanki@apple.com>
+
+        Part of https://bugs.webkit.org/show_bug.cgi?id=63674
+        Get webkit to compile with USE(CFNETWORK) enabled on Mac
+
+        Reviewed by David Kilzer.
+
+        Get coookie storage code to work with USE(CFNETWORK) enabled on Mac.
+
+        No new tests because no change in functionality.
+
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        (WebCore::defaultCookieStorage):
+        (WebCore::defaultSessionCookieStorage):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::createPrivateBrowsingStorageSession):
+        * platform/network/mac/CookieStorageMac.mm:
+
 2011-07-18  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp

@@ -34 +34 @@
 #include "ResourceHandle.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/MainThread.h>
 #include <wtf/RetainPtr.h>
+
+#if PLATFORM(MAC)
+#include "WebCoreSystemInterface.h"
+#elif PLATFORM(WIN)
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
 
 #if USE(PLATFORM_STRATEGIES)
@@ -63 +68 @@
 #if USE(CFNETWORK)
 
-static RetainPtr<CFHTTPCookieStorageRef>& defaultSessionCookieStorage()
+CFHTTPCookieStorageRef defaultCookieStorage()
 {
-    DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
-#if USE(CFURLSTORAGESESSIONS) && PLATFORM(WIN)
-    if (!cookieStorage && ResourceHandle::defaultStorageSession())
-        cookieStorage.adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::defaultStorageSession()));
+#if PLATFORM(WIN)
+    if (CFHTTPCookieStorageRef defaultCookieStorage = defaultSessionCookieStorage().get())
+        return defaultCookieStorage;
 #endif
-    return cookieStorage;
+    return wkGetDefaultHTTPCookieStorage();
 }
 
@@ -80 +84 @@
         return cookieStorage;
     return defaultCookieStorage();
+}
+
+#endif
+
+#if USE(CFNETWORK) && PLATFORM(WIN)
+
+static RetainPtr<CFHTTPCookieStorageRef>& defaultSessionCookieStorage()
+{
+    DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
+#if USE(CFURLSTORAGESESSIONS)
+    if (!cookieStorage && ResourceHandle::defaultStorageSession())
+        cookieStorage.adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::defaultStorageSession()));
+#endif
+    return cookieStorage;
 }
 
@@ -104 +122 @@
 #endif
         privateBrowsingCookieStorage().adoptCF(wkCreateInMemoryHTTPCookieStorage());
-}
-
-CFHTTPCookieStorageRef defaultCookieStorage()
-{
-    if (CFHTTPCookieStorageRef defaultCookieStorage = defaultSessionCookieStorage().get())
-        return defaultCookieStorage;
-    return wkGetDefaultHTTPCookieStorage();
 }
 
@@ -166 +177 @@
 }
 
-#endif // USE(CFNETWORK)
+#endif // USE(CFNETWORK) && PLATFORM(WIN)
 
 } // namespace WebCore

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -771 +771 @@
 RetainPtr<CFURLStorageSessionRef> ResourceHandle::createPrivateBrowsingStorageSession(CFStringRef identifier)
 {
+#if PLATFORM(WIN)
     return RetainPtr<CFURLStorageSessionRef>(AdoptCF, wkCreatePrivateStorageSession(identifier, defaultStorageSession()));
+#else
+    return RetainPtr<CFURLStorageSessionRef>(AdoptCF, wkCreatePrivateStorageSession(identifier));
+#endif
 }
 

trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm

@@ -28 +28 @@
 
 #import "ResourceHandle.h"
-
-#if !USE(CFNETWORK)
 
 #import "WebCoreSystemInterface.h"
@@ -118 +116 @@
 
 }
-
-#endif // !USE(CFNETWORK)