Title: [213331] trunk
- Revision
- 213331
- Author
- beid...@apple.com
- Date
- 2017-03-02 17:34:32 -0800 (Thu, 02 Mar 2017)
Log Message
Update WKWebsiteDatastoreConfiguration SPI.
https://bugs.webkit.org/show_bug.cgi?id=169102
Reviewed by Tim Horton.
Source/WebKit2:
Make these strings URLs, and throw exceptions if you try to use non-file URLs.
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore _initWithConfiguration:]):
* UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
* UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
(checkURLArgument):
(-[_WKWebsiteDataStoreConfiguration _webStorageDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setWebStorageDirectory:]):
(-[_WKWebsiteDataStoreConfiguration _indexedDBDatabaseDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setIndexedDBDatabaseDirectory:]):
(-[_WKWebsiteDataStoreConfiguration _webSQLDatabaseDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setWebSQLDatabaseDirectory:]):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
(-[WebsiteDataStoreCustomPathsMessageHandler userContentController:didReceiveScriptMessage:]):
(TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213330 => 213331)
--- trunk/Source/WebKit2/ChangeLog 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-03 01:34:32 UTC (rev 213331)
@@ -1,3 +1,25 @@
+2017-03-02 Brady Eidson <beid...@apple.com>
+
+ Update WKWebsiteDatastoreConfiguration SPI.
+ https://bugs.webkit.org/show_bug.cgi?id=169102
+
+ Reviewed by Tim Horton.
+
+ Make these strings URLs, and throw exceptions if you try to use non-file URLs.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _initWithConfiguration:]):
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
+ (checkURLArgument):
+ (-[_WKWebsiteDataStoreConfiguration _webStorageDirectory]):
+ (-[_WKWebsiteDataStoreConfiguration _setWebStorageDirectory:]):
+ (-[_WKWebsiteDataStoreConfiguration _indexedDBDatabaseDirectory]):
+ (-[_WKWebsiteDataStoreConfiguration _setIndexedDBDatabaseDirectory:]):
+ (-[_WKWebsiteDataStoreConfiguration _webSQLDatabaseDirectory]):
+ (-[_WKWebsiteDataStoreConfiguration _setWebSQLDatabaseDirectory:]):
+
2017-03-02 Youenn Fablet <you...@apple.com>
Move part of NetworkRTCProvider::close implementation in NetworkRTCProvider destructor
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (213330 => 213331)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2017-03-03 01:34:32 UTC (rev 213331)
@@ -153,12 +153,12 @@
auto config = API::WebsiteDataStore::defaultDataStoreConfiguration();
- if (configuration.webStorageDirectory)
- config.localStorageDirectory = configuration.webStorageDirectory;
- if (configuration.webSQLDatabaseDirectory)
- config.webSQLDatabaseDirectory = configuration.webSQLDatabaseDirectory;
- if (configuration.indexedDBDatabaseDirectory)
- config.indexedDBDatabaseDirectory = configuration.indexedDBDatabaseDirectory;
+ if (configuration._webStorageDirectory)
+ config.localStorageDirectory = configuration._webStorageDirectory.path;
+ if (configuration._webSQLDatabaseDirectory)
+ config.webSQLDatabaseDirectory = configuration._webSQLDatabaseDirectory.path;
+ if (configuration._indexedDBDatabaseDirectory)
+ config.indexedDBDatabaseDirectory = configuration._indexedDBDatabaseDirectory.path;
API::Object::constructInWrapper<API::WebsiteDataStore>(self, config);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (213330 => 213331)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2017-03-03 01:34:32 UTC (rev 213331)
@@ -34,9 +34,9 @@
WK_CLASS_AVAILABLE(macosx(10.13), ios(11.0))
@interface _WKWebsiteDataStoreConfiguration : NSObject
-@property (nonatomic, copy) NSString *webStorageDirectory;
-@property (nonatomic, copy) NSString *indexedDBDatabaseDirectory;
-@property (nonatomic, copy) NSString *webSQLDatabaseDirectory;
+@property (nonatomic, copy, setter=_setWebStorageDirectory:) NSURL *_webStorageDirectory;
+@property (nonatomic, copy, setter=_setIndexedDBDatabaseDirectory:) NSURL *_indexedDBDatabaseDirectory;
+@property (nonatomic, copy, setter=_setWebSQLDatabaseDirectory:) NSURL *_webSQLDatabaseDirectory;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (213330 => 213331)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2017-03-03 01:34:32 UTC (rev 213331)
@@ -28,8 +28,46 @@
#if WK_API_ENABLED
-@implementation _WKWebsiteDataStoreConfiguration
+#import <wtf/RetainPtr.h>
+static void checkURLArgument(NSURL *url)
+{
+ if (url && ![url isFileURL])
+ [NSException raise:NSInvalidArgumentException format:@"%@ is not a file URL", url];
+}
+
+@implementation _WKWebsiteDataStoreConfiguration {
+ RetainPtr<NSURL> _webStorageDirectoryURL;
+ RetainPtr<NSURL> _indexedDBDatabaseDirectoryURL;
+ RetainPtr<NSURL> _webSQLDatabaseDirectoryURL;
+}
+
+-(NSURL *)_webStorageDirectory {
+ return _webStorageDirectoryURL.get();
+}
+
+-(void)_setWebStorageDirectory:(NSURL *)url {
+ checkURLArgument(url);
+ _webStorageDirectoryURL = adoptNS([url copy]);
+}
+
+-(NSURL *)_indexedDBDatabaseDirectory {
+ return _indexedDBDatabaseDirectoryURL.get();
+}
+
+-(void)_setIndexedDBDatabaseDirectory:(NSURL *)url {
+ checkURLArgument(url);
+ _indexedDBDatabaseDirectoryURL = adoptNS([url copy]);
+}
+
+-(NSURL *)_webSQLDatabaseDirectory {
+ return _webSQLDatabaseDirectoryURL.get();
+}
+
+-(void)_setWebSQLDatabaseDirectory:(NSURL *)url {
+ checkURLArgument(url);
+ _webSQLDatabaseDirectoryURL = adoptNS([url copy]);
+}
@end
#endif
Modified: trunk/Tools/ChangeLog (213330 => 213331)
--- trunk/Tools/ChangeLog 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Tools/ChangeLog 2017-03-03 01:34:32 UTC (rev 213331)
@@ -1,3 +1,14 @@
+2017-03-02 Brady Eidson <beid...@apple.com>
+
+ Update WKWebsiteDatastoreConfiguration SPI.
+ https://bugs.webkit.org/show_bug.cgi?id=169102
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
+ (-[WebsiteDataStoreCustomPathsMessageHandler userContentController:didReceiveScriptMessage:]):
+ (TEST):
+
2017-03-02 Jer Noble <jer.no...@apple.com>
Sufficently large timeValue and timeScale arguments to MediaTime will cause wrapping in toTimeScale().
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm (213330 => 213331)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-03-03 01:29:51 UTC (rev 213330)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-03-03 01:34:32 UTC (rev 213331)
@@ -52,7 +52,6 @@
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
{
- printf("Message!\n");
receivedScriptMessage = true;
scriptMessages.append(message);
}
@@ -75,23 +74,23 @@
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- NSString *sqlPath = [@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/WebSQL/" stringByExpandingTildeInPath];
- NSString *idbPath = [@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/IndexedDB/" stringByExpandingTildeInPath];
- NSString *localStoragePath = [@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/LocalStorage/" stringByExpandingTildeInPath];
+ NSURL *sqlPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/WebSQL/" stringByExpandingTildeInPath]];
+ NSURL *idbPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/IndexedDB/" stringByExpandingTildeInPath]];
+ NSURL *localStoragePath = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/LocalStorage/" stringByExpandingTildeInPath]];
- [[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:sqlPath] error:nil];
- [[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:idbPath] error:nil];
- [[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:localStoragePath] error:nil];
+ [[NSFileManager defaultManager] removeItemAtURL:sqlPath error:nil];
+ [[NSFileManager defaultManager] removeItemAtURL:idbPath error:nil];
+ [[NSFileManager defaultManager] removeItemAtURL:localStoragePath error:nil];
- EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath]);
- EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath]);
- EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:idbPath]);
+ EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath.path]);
+ EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath.path]);
+ EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:idbPath.path]);
_WKWebsiteDataStoreConfiguration *websiteDataStoreConfiguration = [[_WKWebsiteDataStoreConfiguration alloc] init];
- websiteDataStoreConfiguration.webSQLDatabaseDirectory = sqlPath;
- websiteDataStoreConfiguration.indexedDBDatabaseDirectory = idbPath;
- websiteDataStoreConfiguration.webStorageDirectory = localStoragePath;
-
+ websiteDataStoreConfiguration._webSQLDatabaseDirectory = sqlPath;
+ websiteDataStoreConfiguration._indexedDBDatabaseDirectory = idbPath;
+ websiteDataStoreConfiguration._webStorageDirectory = localStoragePath;
+
configuration.get().websiteDataStore = [[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration];
[websiteDataStoreConfiguration release];
@@ -105,8 +104,8 @@
getNextMessage();
getNextMessage();
- EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath]);
- EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath]);
+ EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath.path]);
+ EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath.path]);
// FIXME: <rdar://problem/30785618> - We don't yet support IDB database processes at custom paths per WebsiteDataStore
// EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:idbPath]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
