Title: [87077] trunk/Source/WebKit2
- Revision
- 87077
- Author
- [email protected]
- Date
- 2011-05-23 10:15:25 -0700 (Mon, 23 May 2011)
Log Message
[Windows] Initial Cookie Accept Policy not set on Deserialized Storage Session.
https://bugs.webkit.org/show_bug.cgi?id=61255
Reviewed by Darin Adler.
* WebProcess/win/WebProcessWin.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):
Move the code to set the cookie policy before the early return that is taken when using the
default storage session from the UI Process.
Also, remove unnecessary #ifdefs (USE(CFURLSTORAGESESSIONS) is true if USE(CFNETWORK) is
true) and add a comment explaining the early return.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (87076 => 87077)
--- trunk/Source/WebKit2/ChangeLog 2011-05-23 16:40:10 UTC (rev 87076)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-23 17:15:25 UTC (rev 87077)
@@ -1,3 +1,17 @@
+2011-05-23 Jessie Berlin <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ [Windows] Initial Cookie Accept Policy not set on Deserialized Storage Session.
+ https://bugs.webkit.org/show_bug.cgi?id=61255
+
+ * WebProcess/win/WebProcessWin.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ Move the code to set the cookie policy before the early return that is taken when using the
+ default storage session from the UI Process.
+ Also, remove unnecessary #ifdefs (USE(CFURLSTORAGESESSIONS) is true if USE(CFNETWORK) is
+ true) and add a comment explaining the early return.
+
2011-05-23 Qi Zhang <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit2/WebProcess/win/WebProcessWin.cpp (87076 => 87077)
--- trunk/Source/WebKit2/WebProcess/win/WebProcessWin.cpp 2011-05-23 16:40:10 UTC (rev 87076)
+++ trunk/Source/WebKit2/WebProcess/win/WebProcessWin.cpp 2011-05-23 17:15:25 UTC (rev 87077)
@@ -138,12 +138,15 @@
setShouldPaintNativeControls(parameters.shouldPaintNativeControls);
#if USE(CFNETWORK)
-#if USE(CFURLSTORAGESESSIONS)
- if (CFURLStorageSessionRef defaultStorageSession = wkDeserializeStorageSession(parameters.serializedDefaultStorageSession.get())) {
- ResourceHandle::setDefaultStorageSession(defaultStorageSession);
+ CFURLStorageSessionRef defaultStorageSession = wkDeserializeStorageSession(parameters.serializedDefaultStorageSession.get());
+ ResourceHandle::setDefaultStorageSession(defaultStorageSession);
+
+ WebCookieManager::shared().setHTTPCookieAcceptPolicy(parameters.initialHTTPCookieAcceptPolicy);
+
+ // By using the default storage session that came from the ui process, the web process
+ // automatically uses the same the URL Cache as ui process.
+ if (defaultStorageSession)
return;
- }
-#endif // USE(CFURLSTORAGESESSIONS)
RetainPtr<CFStringRef> cachePath(AdoptCF, parameters.cfURLCachePath.createCFString());
if (!cachePath)
@@ -154,8 +157,6 @@
RetainPtr<CFURLCacheRef> uiProcessCache(AdoptCF, CFURLCacheCreate(kCFAllocatorDefault, cacheMemoryCapacity, cacheDiskCapacity, cachePath.get()));
CFURLCacheSetSharedURLCache(uiProcessCache.get());
#endif // USE(CFNETWORK)
-
- WebCookieManager::shared().setHTTPCookieAcceptPolicy(parameters.initialHTTPCookieAcceptPolicy);
}
void WebProcess::platformTerminate()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
