Changeset 81997 in webkit

Timestamp:

Mar 25, 2011 3:33:54 PM (13 years ago)

Author:

jberlin@webkit.org

Message:

Unreviewed build correction.

Patch by Brent Fulgham <​bfulgham@webkit.org> on 2011-03-25
Add stubs for WK2 cookie handling with cURL.

• WebProcess/Cookies/curl: Added.
• WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Added.

(WebKit::WebCookieManager::platformSetHTTPCookieAcceptPolicy):
(WebKit::WebCookieManager::platformGetHTTPCookieAcceptPolicy):

• win/WebKit2.vcproj:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/API/C/win/WKContextPrivateWin.h (modified) (2 diffs)
• UIProcess/API/C/win/WKContextWin.cpp (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/WebContext.h (modified) (2 diffs)
• UIProcess/win/WebContextWin.cpp (modified) (1 diff)
• WebProcess/Cookies/WebCookieManager.h (modified) (2 diffs)
• WebProcess/win/WebProcessWin.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ -25 +25 @@
         * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
         (WebKit::PluginInfoStore::shouldUsePlugin): Blacklist npwpf.dll.
+
+2011-03-25  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        WebKit2: Need to be able to set and get the Cookie Storage Policy.
+        https://bugs.webkit.org/show_bug.cgi?id=50780
+
+        Part 2: Make it possible to set the initial policy on Windows.
+
+        In WebKit1, we read the initial policy on Windows from WebPreferences at startup.
+        Since that is not possible in WebKit2, make it possible to specify the initial policy
+        as a creation parameter to the WebProcess.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        Encode initialHTTPCookieAcceptPolicy on Windows.
+        (WebKit::WebProcessCreationParameters::decode):
+        Decode initialHTTPCookieAcceptPolicy on Windows.
+        * Shared/WebProcessCreationParameters.h:
+
+        * UIProcess/API/C/win/WKContextPrivateWin.h:
+        * UIProcess/API/C/win/WKContextWin.cpp:
+        (WKContextSetInitialHTTPCookieAcceptPolicy):
+        Call through to WebContext.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext):
+        Give the initial policy a default of "Always".
+        * UIProcess/WebContext.h:
+        (WebKit::WebContext::setInitialHTTPCookieAcceptPolicy):
+        * UIProcess/win/WebContextWin.cpp:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        Set the initial policy on Windows.
+
+        * WebProcess/Cookies/WebCookieManager.h:
+        Make setHTTPCookieAcceptPolicy public so that it can be called from WebProcessWin.
+
+        * WebProcess/win/WebProcessWin.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        Tell the WebCookieManager about the initial policy.
 
 2011-03-25  Jessie Berlin  <jberlin@apple.com>

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -82 +82 @@
     encoder->encode(cfURLCacheDiskCapacity);
     encoder->encode(cfURLCacheMemoryCapacity);
+    encoder->encode(initialHTTPCookieAcceptPolicy);
 #endif
 }
@@ -152 +153 @@
     if (!decoder->decode(parameters.cfURLCacheMemoryCapacity))
         return false;
+    if (!decoder->decode(parameters.initialHTTPCookieAcceptPolicy))
+        return false;
 #endif
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -101 +101 @@
     uint64_t cfURLCacheMemoryCapacity;
 
+    uint32_t initialHTTPCookieAcceptPolicy;
+
     bool shouldPaintNativeControls;
 #endif

trunk/Source/WebKit2/UIProcess/API/C/win/WKContextPrivateWin.h

@@ -29 +29 @@
 #include <WebKit2/WKBase.h>
 #include <WebKit2/WKContext.h>
+#include <WebKit2/WKCookieManager.h>
 
 #ifndef __cplusplus
@@ -41 +42 @@
 WK_EXPORT void WKContextSetShouldPaintNativeControls(WKContextRef, bool);
 
+// Defaults to WKHTTPCookieAcceptPolicyAlways.
+WK_EXPORT void WKContextSetInitialHTTPCookieAcceptPolicy(WKContextRef, WKHTTPCookieAcceptPolicy);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/API/C/win/WKContextWin.cpp

@@ -37 +37 @@
     toImpl(contextRef)->setShouldPaintNativeControls(b);
 }
+
+void WKContextSetInitialHTTPCookieAcceptPolicy(WKContextRef contextRef, WKHTTPCookieAcceptPolicy policy)
+{
+    toImpl(contextRef)->setInitialHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
+}

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -127 +127 @@
 #if PLATFORM(WIN)
     , m_shouldPaintNativeControls(true)
+    , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
 #endif
 {

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -131 +131 @@
 #if PLATFORM(WIN)
     void setShouldPaintNativeControls(bool);
+
+    void setInitialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy) { m_initialHTTPCookieAcceptPolicy = policy; }
 #endif
 
@@ -252 +254 @@
 #if PLATFORM(WIN)
     bool m_shouldPaintNativeControls;
+    HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy;
 #endif
 

trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp

@@ -74 +74 @@
 #endif // USE(CFURLSTORAGESESSIONS)
 
+    parameters.initialHTTPCookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
+
 #endif // USE(CFNETWORK)
 }

trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h

@@ -48 +48 @@
     void dispatchCookiesDidChange();
 
+    void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
+
 private:
     WebCookieManager();
@@ -55 +57 @@
     void deleteAllCookies();
 
-    void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
     void platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
     void getHTTPCookieAcceptPolicy(uint64_t callbackID);

trunk/Source/WebKit2/WebProcess/win/WebProcessWin.cpp

@@ -27 +27 @@
 #include "WebProcess.h"
 
+#include "WebCookieManager.h"
 #include "WebProcessCreationParameters.h"
 #include <WebCore/FileSystem.h>
@@ -122 +123 @@
     CFURLCacheSetSharedURLCache(uiProcessCache.get());
 #endif
+
+    WebCookieManager::shared().setHTTPCookieAcceptPolicy(parameters.initialHTTPCookieAcceptPolicy);
 }