Diff
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -746,7 +746,7 @@
addExtraPaths(launchOptions.extraSandboxPaths, sandboxArgs);
- Vector<String> extraPaths = { "applicationCacheDirectory"_s, "mediaKeysDirectory"_s, "waylandSocket"_s, "webSQLDatabaseDirectory"_s };
+ Vector<String> extraPaths = { "applicationCacheDirectory"_s, "mediaKeysDirectory"_s, "waylandSocket"_s };
for (const auto& path : extraPaths) {
String extraPath = launchOptions.extraInitializationData.get(path);
if (!extraPath.isEmpty())
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2022-05-31 17:05:10 UTC (rev 295056)
@@ -351,7 +351,7 @@
String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
{
- return websiteDataDirectoryFileSystemRepresentation("WebSQL"_s);
+ return websiteDataDirectoryFileSystemRepresentation("WebSQL"_s, ShouldCreateDirectory::No);
}
String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
@@ -428,7 +428,7 @@
return url.absoluteURL.path;
}
-String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
+String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory shouldCreateDirectory)
{
static dispatch_once_t onceToken;
static NeverDestroyed<RetainPtr<NSURL>> websiteDataURL;
@@ -451,9 +451,12 @@
});
NSURL *url = "" URLByAppendingPathComponent:directoryName isDirectory:YES];
- if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
- LOG_ERROR("Failed to create directory %@", url);
+ if (shouldCreateDirectory == ShouldCreateDirectory::Yes) {
+ if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
+ LOG_ERROR("Failed to create directory %@", url);
+ }
+
return url.absoluteURL.path;
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -279,8 +279,6 @@
m_resolvedConfiguration->setMediaCacheDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->mediaCacheDirectory()));
if (!m_configuration->mediaKeysStorageDirectory().isEmpty())
m_resolvedConfiguration->setMediaKeysStorageDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->mediaKeysStorageDirectory()));
- if (!m_configuration->webSQLDatabaseDirectory().isEmpty())
- m_resolvedConfiguration->setWebSQLDatabaseDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->webSQLDatabaseDirectory()));
if (!m_configuration->indexedDBDatabaseDirectory().isEmpty())
m_resolvedConfiguration->setIndexedDBDatabaseDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->indexedDBDatabaseDirectory()));
if (!m_configuration->alternativeServicesDirectory().isEmpty() && WebsiteDataStore::http3Enabled())
@@ -313,6 +311,9 @@
m_resolvedConfiguration->setCookieStorageFile(resolveAndCreateReadWriteDirectoryForSandboxExtension(FileSystem::parentPath(m_configuration->cookieStorageFile())));
m_resolvedConfiguration->setCookieStorageFile(FileSystem::pathByAppendingComponent(m_resolvedConfiguration->cookieStorageFile(), FileSystem::pathFileName(m_configuration->cookieStorageFile())));
}
+
+ if (auto directory = m_configuration->webSQLDatabaseDirectory(); !directory.isEmpty())
+ FileSystem::deleteNonEmptyDirectory(directory);
}
enum class ProcessAccessType : uint8_t { None, OnlyIfLaunched, Launch };
@@ -520,16 +521,6 @@
});
}
- if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
- m_queue->dispatch([webSQLDatabaseDirectory = m_configuration->webSQLDatabaseDirectory().isolatedCopy(), callbackAggregator]() {
- WebsiteData websiteData;
- websiteData.entries = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->origins().map([](auto& origin) {
- return WebsiteData::Entry { origin, WebsiteDataType::WebSQLDatabases, 0 };
- });
- callbackAggregator->addWebsiteData(WTFMove(websiteData));
- });
- }
-
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
m_queue->dispatch([mediaKeysStorageDirectory = m_configuration->mediaKeysStorageDirectory().isolatedCopy(), callbackAggregator] {
WebsiteData websiteData;
@@ -675,12 +666,6 @@
});
}
- if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
- m_queue->dispatch([webSQLDatabaseDirectory = m_configuration->webSQLDatabaseDirectory().isolatedCopy(), callbackAggregator, modifiedSince] {
- WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->deleteDatabasesModifiedSince(modifiedSince);
- });
- }
-
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
m_queue->dispatch([mediaKeysStorageDirectory = m_configuration->mediaKeysStorageDirectory().isolatedCopy(), callbackAggregator, modifiedSince] {
removeMediaKeys(mediaKeysStorageDirectory, modifiedSince);
@@ -793,20 +778,6 @@
});
}
- if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
- HashSet<WebCore::SecurityOriginData> origins;
- for (const auto& dataRecord : dataRecords) {
- for (const auto& origin : dataRecord.origins)
- origins.add(crossThreadCopy(origin));
- }
-
- m_queue->dispatch([origins = WTFMove(origins), callbackAggregator, webSQLDatabaseDirectory = m_configuration->webSQLDatabaseDirectory().isolatedCopy()] {
- auto databaseTracker = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory);
- for (auto& origin : origins)
- databaseTracker->deleteOrigin(origin);
- });
- }
-
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
HashSet<WebCore::SecurityOriginData> origins;
for (const auto& dataRecord : dataRecords) {
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2022-05-31 17:05:10 UTC (rev 295056)
@@ -257,7 +257,6 @@
const String& resolvedAlternativeServicesStorageDirectory() const { return m_resolvedConfiguration->alternativeServicesDirectory(); }
const String& resolvedMediaCacheDirectory() const { return m_resolvedConfiguration->mediaCacheDirectory(); }
const String& resolvedMediaKeysDirectory() const { return m_resolvedConfiguration->mediaKeysStorageDirectory(); }
- const String& resolvedDatabaseDirectory() const { return m_resolvedConfiguration->webSQLDatabaseDirectory(); }
const String& resolvedJavaScriptConfigurationDirectory() const { return m_resolvedConfiguration->_javascript_ConfigurationDirectory(); }
const String& resolvedCookieStorageFile() const { return m_resolvedConfiguration->cookieStorageFile(); }
const String& resolvedIndexedDBDatabaseDirectory() const { return m_resolvedConfiguration->indexedDBDatabaseDirectory(); }
@@ -408,7 +407,7 @@
enum class ShouldCreateDirectory { No, Yes };
static String tempDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory = ShouldCreateDirectory::Yes);
static String cacheDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory = ShouldCreateDirectory::Yes);
- static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
+ static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory = ShouldCreateDirectory::Yes);
HashSet<RefPtr<WebProcessPool>> processPools(size_t limit = std::numeric_limits<size_t>::max()) const;
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/playstation/WebsiteDataStorePlayStation.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/playstation/WebsiteDataStorePlayStation.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/playstation/WebsiteDataStorePlayStation.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -101,7 +101,7 @@
return { };
}
-String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
+String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory)
{
return { };
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -101,7 +101,7 @@
return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), directoryName);
}
-String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
+String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory)
{
return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), directoryName);
}
Modified: trunk/Source/WebKit/UIProcess/glib/WebProcessProxyGLib.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/glib/WebProcessProxyGLib.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/glib/WebProcessProxyGLib.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -51,7 +51,6 @@
ASSERT(dataStore);
dataStore->resolveDirectoriesIfNecessary();
- launchOptions.extraInitializationData.set("webSQLDatabaseDirectory"_s, dataStore->resolvedDatabaseDirectory());
launchOptions.extraInitializationData.set("mediaKeysDirectory"_s, dataStore->resolvedMediaKeysDirectory());
launchOptions.extraInitializationData.set("applicationCacheDirectory"_s, dataStore->resolvedApplicationCacheDirectory());
Modified: trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp (295055 => 295056)
--- trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -104,7 +104,7 @@
return FileSystem::pathByAppendingComponent(FileSystem::userCacheDirectory(), directoryName);
}
-WTF::String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName)
+WTF::String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory)
{
return FileSystem::pathByAppendingComponent(FileSystem::userDataDirectory(), directoryName);
}
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp (295055 => 295056)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -146,11 +146,6 @@
WebKit::InjectedBundle::reportException(context, exception);
}
-void WKBundleClearAllDatabases(WKBundleRef)
-{
- WebCore::DatabaseTracker::singleton().deleteAllDatabasesImmediately();
-}
-
void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
{
// Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (295055 => 295056)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2022-05-31 17:05:10 UTC (rev 295056)
@@ -59,7 +59,6 @@
WK_EXPORT WKArrayRef WKBundleGetLiveDocumentURLsForTesting(WKBundleRef bundle, bool excludeDocumentsInPageGroupPages);
// Local storage API
-WK_EXPORT void WKBundleClearAllDatabases(WKBundleRef bundle);
WK_EXPORT void WKBundleSetDatabaseQuota(WKBundleRef bundle, uint64_t);
// Garbage collection API
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (295055 => 295056)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -765,26 +765,6 @@
m_page.sendSyncWithDelayedReply(Messages::WebPageProxy::PrintFrame(webFrame->frameID(), truncatedTitle.string, pdfFirstPageSize), Messages::WebPageProxy::PrintFrame::Reply());
}
-void WebChromeClient::exceededDatabaseQuota(Frame& frame, const String& databaseName, DatabaseDetails details)
-{
- WebFrame* webFrame = WebFrame::fromCoreFrame(frame);
- ASSERT(webFrame);
-
- auto& origin = frame.document()->securityOrigin();
- auto& originData = origin.data();
- auto& tracker = DatabaseTracker::singleton();
- auto currentQuota = tracker.quota(originData);
- auto currentOriginUsage = tracker.usage(originData);
- uint64_t newQuota = 0;
- auto securityOrigin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(originData.databaseIdentifier())->securityOrigin());
- newQuota = m_page.injectedBundleUIClient().didExceedDatabaseQuota(&m_page, securityOrigin.ptr(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage());
-
- if (!newQuota)
- m_page.sendSyncWithDelayedReply(Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), originData.databaseIdentifier(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage()), Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota));
-
- tracker.setQuota(originData, newQuota);
-}
-
void WebChromeClient::reachedMaxAppCacheSize(int64_t)
{
notImplemented();
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (295055 => 295056)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2022-05-31 17:05:10 UTC (rev 295056)
@@ -147,7 +147,7 @@
void print(WebCore::Frame&, const WebCore::StringWithDirection&) final;
- void exceededDatabaseQuota(WebCore::Frame&, const String& databaseName, WebCore::DatabaseDetails) final;
+ void exceededDatabaseQuota(WebCore::Frame&, const String& databaseName, WebCore::DatabaseDetails) final { }
void reachedMaxAppCacheSize(int64_t spaceNeeded) final;
void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin&, int64_t spaceNeeded) final;
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (295055 => 295056)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -1511,8 +1511,6 @@
#if PLATFORM(IOS_FAMILY)
m_webSQLiteDatabaseTracker.setIsSuspended(true);
SQLiteDatabase::setIsDatabaseOpeningForbidden(true);
- if (DatabaseTracker::isInitialized())
- DatabaseTracker::singleton().closeAllDatabases(CurrentQueryBehavior::Interrupt);
IPC::AccessibilityProcessSuspendedNotification(true);
updateFreezerStatus();
#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.html (295055 => 295056)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.html 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.html 2022-05-31 17:05:10 UTC (rev 295056)
@@ -26,13 +26,4 @@
document.cookie = "testkey=value; expires=Mon, 01 Jan 2035 00:00:00 GMT";
log('cookie written');
-try {
-openDatabase('WebsiteDataStoreCustomPathsSQL', '1.0', 'Test DB', 524288, function() {
- log('WebSQL database created');
-});
-} catch(e) {
- // An exception is fine, because the database tracker will still be installed at the expected path
- log('Exception: ' + e);
-}
-
</script>
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (295055 => 295056)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2022-05-31 17:05:10 UTC (rev 295056)
@@ -81,38 +81,31 @@
auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- NSURL *sqlPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/CustomWebsiteData/WebSQL/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *idbPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/CustomWebsiteData/IndexedDB/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *localStoragePath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/CustomWebsiteData/LocalStorage/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *cookieStorageFile = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/CustomWebsiteData/CookieStorage/Cookie.File" stringByExpandingTildeInPath] isDirectory:NO];
NSURL *resourceLoadStatisticsPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/CustomWebsiteData/ResourceLoadStatistics/" stringByExpandingTildeInPath] isDirectory:YES];
- NSURL *defaultSQLPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/WebSQL/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *defaultIDBPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/IndexedDB/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *defaultLocalStoragePath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/LocalStorage/" stringByExpandingTildeInPath] isDirectory:YES];
NSURL *defaultResourceLoadStatisticsPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics/" stringByExpandingTildeInPath] isDirectory:YES];
- [[NSFileManager defaultManager] removeItemAtURL:sqlPath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:idbPath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:localStoragePath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:cookieStorageFile error:nil];
[[NSFileManager defaultManager] removeItemAtURL:resourceLoadStatisticsPath error:nil];
- [[NSFileManager defaultManager] removeItemAtURL:defaultSQLPath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:defaultIDBPath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:defaultLocalStoragePath error:nil];
[[NSFileManager defaultManager] removeItemAtURL:defaultResourceLoadStatisticsPath error:nil];
- EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:idbPath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:cookieStorageFile.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:resourceLoadStatisticsPath.path]);
- EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:defaultSQLPath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:defaultIDBPath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:defaultLocalStoragePath.path]);
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:defaultResourceLoadStatisticsPath.path]);
auto websiteDataStoreConfiguration = adoptNS([[_WKWebsiteDataStoreConfiguration alloc] init]);
- websiteDataStoreConfiguration.get()._webSQLDatabaseDirectory = sqlPath;
websiteDataStoreConfiguration.get()._indexedDBDatabaseDirectory = idbPath;
websiteDataStoreConfiguration.get()._webStorageDirectory = localStoragePath;
websiteDataStoreConfiguration.get()._cookieStorageFile = cookieStorageFile;
@@ -124,18 +117,14 @@
auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
[webView setNavigationDelegate:handler.get()];
- auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
- WKPreferencesSetWebSQLDisabled(preferences, false);
-
NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebsiteDataStoreCustomPaths" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
[webView loadRequest:request];
EXPECT_FALSE([WKWebsiteDataStore _defaultDataStoreExists]);
- // We expect 4 messages, 1 each for WebSQL, IndexedDB, cookies, and localStorage.
+ // We expect 3 messages, 1 each for IndexedDB, cookies, and localStorage.
EXPECT_STREQ([getNextMessage().body UTF8String], "localstorage written");
EXPECT_STREQ([getNextMessage().body UTF8String], "cookie written");
- EXPECT_STREQ([getNextMessage().body UTF8String], "Exception: UnknownError: Web SQL is deprecated");
EXPECT_STREQ([getNextMessage().body UTF8String], "Success opening indexed database");
__block bool flushed = false;
@@ -164,7 +153,6 @@
handler = nil;
configuration = nil;
- EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:sqlPath.path]);
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:localStoragePath.path]);
#if PLATFORM(IOS_FAMILY)
@@ -187,8 +175,7 @@
#endif
#if PLATFORM(MAC)
- // FIXME: The default SQL and LocalStorage paths are being used for something, but they shouldn't be. (theses should be false, not true)
- EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultSQLPath.path]);
+ // FIXME: The default LocalStorage path is being used for something, but they shouldn't be. (theses should be false, not true)
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:defaultLocalStoragePath.path]);
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (295055 => 295056)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -539,7 +539,6 @@
if (testingMode != BegingTestingMode::New)
return;
- WKBundleClearAllDatabases(m_bundle.get());
WKBundlePageClearApplicationCache(page()->page());
WKBundleResetOriginAccessAllowLists(m_bundle.get());
clearResourceLoadStatistics();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (295055 => 295056)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2022-05-31 16:59:01 UTC (rev 295055)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2022-05-31 17:05:10 UTC (rev 295056)
@@ -374,7 +374,6 @@
void TestRunner::clearAllDatabases()
{
- WKBundleClearAllDatabases(InjectedBundle::singleton().bundle());
postSynchronousMessage("DeleteAllIndexedDatabases", true);
}
