Title: [87222] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87221 => 87222)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 22:52:21 UTC (rev 87221)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 22:53:42 UTC (rev 87222)
@@ -1,5 +1,23 @@
2011-05-24 Lucas Forschler <[email protected]>
+ Merged r87077.
+
+ 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-24 Lucas Forschler <[email protected]>
+
Merged r87046.
2011-05-21 John Sullivan <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/win/WebProcessWin.cpp (87221 => 87222)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/win/WebProcessWin.cpp 2011-05-24 22:52:21 UTC (rev 87221)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/win/WebProcessWin.cpp 2011-05-24 22:53:42 UTC (rev 87222)
@@ -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
