Title: [169437] trunk/Source/WebKit2
- Revision
- 169437
- Author
- jp...@apple.com
- Date
- 2014-05-28 16:14:17 -0700 (Wed, 28 May 2014)
Log Message
Add Obj-C API for cache partitioned URL schemes
https://bugs.webkit.org/show_bug.cgi?id=133361
<rdar://problem/17035415>
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]):
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration cachePartitionedURLSchemes]):
(-[_WKProcessPoolConfiguration setCachePartitionedURLSchemes:]):
(-[_WKProcessPoolConfiguration copyWithZone:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169436 => 169437)
--- trunk/Source/WebKit2/ChangeLog 2014-05-28 22:54:40 UTC (rev 169436)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-28 23:14:17 UTC (rev 169437)
@@ -1,3 +1,19 @@
+2014-05-28 Jeffrey Pfau <jp...@apple.com>
+
+ Add Obj-C API for cache partitioned URL schemes
+ https://bugs.webkit.org/show_bug.cgi?id=133361
+ <rdar://problem/17035415>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]):
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration cachePartitionedURLSchemes]):
+ (-[_WKProcessPoolConfiguration setCachePartitionedURLSchemes:]):
+ (-[_WKProcessPoolConfiguration copyWithZone:]):
+
2014-05-28 Sam Weinig <s...@webkit.org>
[iOS WebKit2] Sometimes Safari gets into a limbo state after web process crash
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (169436 => 169437)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-28 22:54:40 UTC (rev 169436)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-28 23:14:17 UTC (rev 169437)
@@ -162,6 +162,11 @@
_context->setUsesNetworkProcess(true);
_context->setProcessModel(WebKit::ProcessModelMultipleSecondaryProcesses);
+#if ENABLE(CACHE_PARTITIONING)
+ for (NSString *urlScheme in [_configuration cachePartitionedURLSchemes])
+ _context->registerURLSchemeAsCachePartitioned(urlScheme);
+#endif
+
// FIXME: Add a way to configure the cache model, see <rdar://problem/16206857>.
_context->setCacheModel(WebKit::CacheModelPrimaryWebBrowser);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (169436 => 169437)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2014-05-28 22:54:40 UTC (rev 169436)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2014-05-28 23:14:17 UTC (rev 169437)
@@ -33,6 +33,7 @@
@property (nonatomic, copy) NSURL *injectedBundleURL;
@property (nonatomic) NSUInteger maximumProcessCount;
+@property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (169436 => 169437)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2014-05-28 22:54:40 UTC (rev 169436)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2014-05-28 23:14:17 UTC (rev 169437)
@@ -32,6 +32,7 @@
@implementation _WKProcessPoolConfiguration {
RetainPtr<NSURL> _injectedBundleURL;
+ RetainPtr<NSArray> _cachePartitionedURLSchemes;
}
- (NSURL *)injectedBundleURL
@@ -44,6 +45,16 @@
_injectedBundleURL = adoptNS([injectedBundleURL copy]);
}
+- (NSArray *)cachePartitionedURLSchemes
+{
+ return _cachePartitionedURLSchemes.get();
+}
+
+- (void)setCachePartitionedURLSchemes:(NSArray *)cachePartitionedURLSchemes
+{
+ _cachePartitionedURLSchemes = adoptNS([cachePartitionedURLSchemes copy]);
+}
+
- (NSString *)description
{
NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %lu", NSStringFromClass(self.class), self, static_cast<unsigned long>(_maximumProcessCount)];
@@ -59,6 +70,7 @@
configuration.maximumProcessCount = self.maximumProcessCount;
configuration.injectedBundleURL = self.injectedBundleURL;
+ configuration.cachePartitionedURLSchemes = self.cachePartitionedURLSchemes;
return configuration;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
