Title: [139931] trunk/Source/WebKit2
- Revision
- 139931
- Author
- a...@apple.com
- Date
- 2013-01-16 15:23:57 -0800 (Wed, 16 Jan 2013)
Log Message
WebProcess should not access ~/Library/Caches/com.apple.WebProcess
https://bugs.webkit.org/show_bug.cgi?id=107055
Reviewed by Anders Carlsson.
* WebProcess/com.apple.WebProcess.sb.in: Remove the rule allowing access.
* WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::platformInitializeWebProcess):
Use a correct cache directory even if NetworkProcess is in use. Not all loading has
moved to this process yet.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139930 => 139931)
--- trunk/Source/WebKit2/ChangeLog 2013-01-16 23:15:35 UTC (rev 139930)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-16 23:23:57 UTC (rev 139931)
@@ -1,3 +1,16 @@
+2013-01-16 Alexey Proskuryakov <a...@apple.com>
+
+ WebProcess should not access ~/Library/Caches/com.apple.WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=107055
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/com.apple.WebProcess.sb.in: Remove the rule allowing access.
+
+ * WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::platformInitializeWebProcess):
+ Use a correct cache directory even if NetworkProcess is in use. Not all loading has
+ moved to this process yet.
+
2013-01-16 Anders Carlsson <ander...@apple.com>
Remove CoreIPCMessageKinds.h
Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (139930 => 139931)
--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2013-01-16 23:15:35 UTC (rev 139930)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2013-01-16 23:23:57 UTC (rev 139931)
@@ -89,7 +89,6 @@
;; Writable preferences and temporary files
(allow file*
- (home-subpath "/Library/Caches/com.apple.WebProcess")
(home-regex #"/Library/Preferences/ByHost/com\.apple\.HIToolbox\.")
(home-regex #"/Library/Preferences/com\.apple\.WebProcess\.")
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (139930 => 139931)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-01-16 23:15:35 UTC (rev 139930)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-01-16 23:23:57 UTC (rev 139931)
@@ -273,19 +273,14 @@
SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
-#if ENABLE(NETWORK_PROCESS)
- if (!parameters.usesNetworkProcess) {
-#endif
- if (!parameters.diskCacheDirectory.isNull()) {
- NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity;
- NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity;
+ // FIXME (NetworkProcess): This should not be necessary once all loading is in NetworkProcess.
+ if (!parameters.diskCacheDirectory.isNull()) {
+ NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity;
+ NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity;
- RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:parameters.diskCacheDirectory]);
- [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
- }
-#if ENABLE(NETWORK_PROCESS)
+ RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:parameters.diskCacheDirectory]);
+ [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
}
-#endif
m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
