Title: [144958] trunk/Source/WebKit2
- Revision
- 144958
- Author
- [email protected]
- Date
- 2013-03-06 11:48:33 -0800 (Wed, 06 Mar 2013)
Log Message
Joing the adoptNS/adoptCF/adoptRef club.
https://bugs.webkit.org/show_bug.cgi?id=111467
Reviewed by Darin Adler.
Responding to review comments by Darin Adler.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformInitializeWebProcess): Tighten up this code
by reducing extraneous local variables.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (144957 => 144958)
--- trunk/Source/WebKit2/ChangeLog 2013-03-06 19:43:24 UTC (rev 144957)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-06 19:48:33 UTC (rev 144958)
@@ -1,3 +1,18 @@
+2013-03-06 Geoffrey Garen <[email protected]>
+
+ Joing the adoptNS/adoptCF/adoptRef club.
+ https://bugs.webkit.org/show_bug.cgi?id=111467
+
+ Reviewed by Darin Adler.
+
+ Responding to review comments by Darin Adler.
+
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess): Tighten up this code
+ by reducing extraneous local variables.
+
2013-03-05 Alexey Proskuryakov <[email protected]>
Track sandbox extensions for blobs in NetworkProcess
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (144957 => 144958)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2013-03-06 19:43:24 UTC (rev 144957)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2013-03-06 19:48:33 UTC (rev 144958)
@@ -106,11 +106,10 @@
if (!m_diskCacheDirectory.isNull()) {
SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
- 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()];
+ [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
+ initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
+ diskCapacity:parameters.nsURLCacheDiskCapacity
+ diskPath:parameters.diskCacheDirectory]).get()];
}
#if USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (144957 => 144958)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-03-06 19:43:24 UTC (rev 144957)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-03-06 19:48:33 UTC (rev 144958)
@@ -161,11 +161,10 @@
if (!m_usesNetworkProcess) {
#endif
if (!parameters.diskCacheDirectory.isNull()) {
- RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc]
+ [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
diskCapacity:parameters.nsURLCacheDiskCapacity
- diskPath:parameters.diskCacheDirectory]);
- [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
+ diskPath:parameters.diskCacheDirectory]).get()];
}
#if ENABLE(NETWORK_PROCESS)
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
