Diff
Modified: trunk/Source/WebKit/ChangeLog (292125 => 292126)
--- trunk/Source/WebKit/ChangeLog 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Source/WebKit/ChangeLog 2022-03-30 23:19:22 UTC (rev 292126)
@@ -1,3 +1,16 @@
+2022-03-30 Sihui Liu <sihui_...@apple.com>
+
+ Remove -[WKWebsiteDataStore _indexedDBDatabaseDirectory]
+ https://bugs.webkit.org/show_bug.cgi?id=238487
+
+ Reviewed by Alex Christensen.
+
+ This is not used by SPI clients, and we have -[_WKWebsiteDataStoreConfiguration _indexedDBDatabaseDirectory].
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _indexedDBDatabaseDirectory]): Deleted.
+ * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
+
2022-03-30 Devin Rousso <drou...@apple.com>
Web Inspector: Sources: the mapped file URL of a Response Local Override should be clickable
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (292125 => 292126)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2022-03-30 23:19:22 UTC (rev 292126)
@@ -403,11 +403,6 @@
return nil;
}
-- (NSURL *)_indexedDBDatabaseDirectory
-{
- return [NSURL fileURLWithPath:_websiteDataStore->configuration().indexedDBDatabaseDirectory() isDirectory:YES];
-}
-
- (void)_setResourceLoadStatisticsTestingCallback:(void (^)(WKWebsiteDataStore *, NSString *))callback
{
#if ENABLE(INTELLIGENT_TRACKING_PREVENTION)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (292125 => 292126)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2022-03-30 23:19:22 UTC (rev 292126)
@@ -57,7 +57,6 @@
@property (nonatomic, setter=_setAllowsCellularAccess:) BOOL _allowsCellularAccess WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.allowsCellularAccess", macos(10.13.4, 10.15.4), ios(11.3, 13.4));
@property (nonatomic, setter=_setProxyConfiguration:) NSDictionary *_proxyConfiguration WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.proxyConfiguration", macos(10.14, 10.15.4), ios(12.0, 13.4));
@property (nonatomic, setter=_setAllowsTLSFallback:) BOOL _allowsTLSFallback WK_API_AVAILABLE(macos(10.15), ios(13.0));
-@property (nonatomic, readonly) NSURL *_indexedDBDatabaseDirectory WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration._indexedDBDatabaseDirectory", macos(10.11, 11.0), ios(9.0, 14.0));
- (void)_setResourceLoadStatisticsTestingCallback:(nullable void (^)(WKWebsiteDataStore *, NSString *))callback WK_API_AVAILABLE(macos(10.13), ios(11.0));
- (void)_getAllStorageAccessEntriesFor:(WKWebView *)webView completionHandler:(void (^)(NSArray<NSString *> *domains))completionHandler WK_API_AVAILABLE(macos(10.14), ios(12.0));
Modified: trunk/Tools/ChangeLog (292125 => 292126)
--- trunk/Tools/ChangeLog 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Tools/ChangeLog 2022-03-30 23:19:22 UTC (rev 292126)
@@ -1,3 +1,16 @@
+2022-03-30 Sihui Liu <sihui_...@apple.com>
+
+ Remove -[WKWebsiteDataStore _indexedDBDatabaseDirectory]
+ https://bugs.webkit.org/show_bug.cgi?id=238487
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/IndexedDBFileName.mm:
+ (createDirectories):
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/IndexedDBUserDelete.mm:
+ (TEST):
+
2022-03-30 Jonathan Bedard <jbed...@apple.com>
[Merge-Queue] Add http credential helper
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBFileName.mm (292125 => 292126)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBFileName.mm 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBFileName.mm 2022-03-30 23:19:22 UTC (rev 292126)
@@ -110,7 +110,7 @@
static void createDirectories(String testName)
{
auto defaultFileManager = [NSFileManager defaultManager];
- NSURL *idbRootURL = [[WKWebsiteDataStore defaultDataStore] _indexedDBDatabaseDirectory];
+ NSURL *idbRootURL = [[[WKWebsiteDataStore defaultDataStore] _configuration] _indexedDBDatabaseDirectory];
[defaultFileManager removeItemAtURL:idbRootURL error:nil];
NSString *existingDatabaseName = @"IndexedDBTest";
@@ -200,7 +200,7 @@
TestWebKitAPI::Util::run(&readyToContinue);
auto defaultFileManager = [NSFileManager defaultManager];
- NSURL *idbRootURL = [[WKWebsiteDataStore defaultDataStore] _indexedDBDatabaseDirectory];
+ NSURL *idbRootURL = [[[WKWebsiteDataStore defaultDataStore] _configuration] _indexedDBDatabaseDirectory];
NSURL *newVersionDirectoryURL = [idbRootURL URLByAppendingPathComponent:@"v1"];
NSArray *directories = [defaultFileManager contentsOfDirectoryAtPath:idbRootURL.path error:nullptr];
EXPECT_EQ(2U, [directories count]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBUserDelete.mm (292125 => 292126)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBUserDelete.mm 2022-03-30 22:59:32 UTC (rev 292125)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/IndexedDBUserDelete.mm 2022-03-30 23:19:22 UTC (rev 292126)
@@ -77,7 +77,7 @@
TEST(IndexedDB, IndexedDBUserDeleteBeforeLoading)
{
- NSURL *idbURL = [[WKWebsiteDataStore defaultDataStore] _indexedDBDatabaseDirectory];
+ NSURL *idbURL = [[[WKWebsiteDataStore defaultDataStore] _configuration] _indexedDBDatabaseDirectory];
NSURL *fileIDBURL = [[idbURL URLByAppendingPathComponent:@"file__0"] URLByAppendingPathComponent:@"IndexedDBUserDeleteBeforeLoading"];
NSURL *fileURL = [[NSBundle mainBundle] URLForResource:@"IndexedDB" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
[[NSFileManager defaultManager] createDirectoryAtURL:fileIDBURL withIntermediateDirectories:YES attributes:nil error:nil];
