Diff
Modified: trunk/LayoutTests/ChangeLog (275658 => 275659)
--- trunk/LayoutTests/ChangeLog 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/LayoutTests/ChangeLog 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1,3 +1,15 @@
+2021-04-08 Sihui Liu <[email protected]>
+
+ Remove logging for investigating http/tests/IndexedDB/storage-limit-1.html failure
+ https://bugs.webkit.org/show_bug.cgi?id=223086
+ <rdar://problem/75591816>
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/IndexedDB/storage-limit-1.https.html:
+ * http/tests/IndexedDB/storage-limit-2.https.html:
+ * http/tests/IndexedDB/storage-limit.https.html:
+
2021-04-08 Antti Koivisto <[email protected]>
Revert r273621 because iPhone PLT regression
Modified: trunk/LayoutTests/http/tests/IndexedDB/storage-limit-1.https.html (275658 => 275659)
--- trunk/LayoutTests/http/tests/IndexedDB/storage-limit-1.https.html 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/LayoutTests/http/tests/IndexedDB/storage-limit-1.https.html 2021-04-08 16:14:46 UTC (rev 275659)
@@ -5,10 +5,8 @@
</head>
<body>
<script>
-if (window.testRunner) {
- testRunner.setQuotaLoggingEnabled(true);
+if (window.testRunner)
testRunner.setAllowStorageQuotaIncrease(false);
-}
description("This test makes sure that storage of indexedDB and Cache API do not grow unboundedly.");
@@ -27,7 +25,7 @@
indexedDBTest(prepareDatabase, onOpenSuccess, {'suffix': '-1'});
}).catch(e => {
testFailed("Cache API store operation failed: " + e);
- finishTest();
+ finishJSTest();
});
function prepareDatabase(event)
@@ -47,19 +45,14 @@
shouldBeTrue("'error' in request");
shouldBe("request.error.code", "DOMException.QUOTA_EXCEEDED_ERR");
shouldBeEqualToString("request.error.name", "QuotaExceededError");
- finishTest();
+ finishJSTest();
}
request._onsuccess_ = function(event) {
testFailed("Add operation should fail because storage limit is reached, but succeeded.");
- finishTest();
+ finishJSTest();
}
}
-
-function finishTest() {
- testRunner.setQuotaLoggingEnabled(false);
- finishJSTest();
-}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/IndexedDB/storage-limit-2.https.html (275658 => 275659)
--- trunk/LayoutTests/http/tests/IndexedDB/storage-limit-2.https.html 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/LayoutTests/http/tests/IndexedDB/storage-limit-2.https.html 2021-04-08 16:14:46 UTC (rev 275659)
@@ -5,10 +5,8 @@
</head>
<body>
<script>
-if (window.testRunner) {
- testRunner.setQuotaLoggingEnabled(true);
+if (window.testRunner)
testRunner.setAllowStorageQuotaIncrease(false);
-}
description("This test makes sure that storage of indexedDB and Cache API do not grow unboundedly.");
@@ -29,7 +27,7 @@
evalAndLog("request = store.add(new Uint8Array(204800), 'key')");
request._onerror_ = function(event) {
testFailed("Add operation should fail because storage limit is reached, but succeeded.");
- finishTest();
+ finishJSTest();
}
request._onsuccess_ = async (event) => {
@@ -53,17 +51,12 @@
return cache.put(new Request("/test"), new Response(new Uint8Array(304800)));
}).then(() => {
testFailed("Cache API store operation succeeded");
- finishTest();
+ finishJSTest();
}).catch(e => {
debug("Cache API store operation failed: " + e);
- finishTest();
+ finishJSTest();
});
}
-
-function finishTest() {
- testRunner.setQuotaLoggingEnabled(false);
- finishJSTest();
-}
</script>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/IndexedDB/storage-limit.https.html (275658 => 275659)
--- trunk/LayoutTests/http/tests/IndexedDB/storage-limit.https.html 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/LayoutTests/http/tests/IndexedDB/storage-limit.https.html 2021-04-08 16:14:46 UTC (rev 275659)
@@ -5,10 +5,8 @@
</head>
<body>
<script>
-if (window.testRunner) {
- testRunner.setQuotaLoggingEnabled(true);
+if (window.testRunner)
testRunner.setAllowStorageQuotaIncrease(false);
-}
description("This test makes sure that storage of indexedDB does not grow unboundedly.");
@@ -18,7 +16,7 @@
indexedDBTest(prepareDatabase, onOpenSuccess, {'suffix': '-1'});
}).catch(e => {
testFailed("Cache API store operation failed: " + e);
- finishTest();
+ finishJSTest();
});
function prepareDatabase(event)
@@ -38,19 +36,14 @@
shouldBeTrue("'error' in request");
shouldBe("request.error.code", "DOMException.QUOTA_EXCEEDED_ERR");
shouldBeEqualToString("request.error.name", "QuotaExceededError");
- finishTest();
+ finishJSTest();
}
request._onsuccess_ = function(event) {
testFailed("Add operation should fail because storage limit is reached, but succeeded.");
- finishTest();
+ finishJSTest();
}
}
-
-function finishTest() {
- testRunner.setQuotaLoggingEnabled(false);
- finishJSTest();
-}
</script>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (275658 => 275659)
--- trunk/Source/WebCore/ChangeLog 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/ChangeLog 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1,3 +1,23 @@
+2021-04-08 Sihui Liu <[email protected]>
+
+ Remove logging for investigating http/tests/IndexedDB/storage-limit-1.html failure
+ https://bugs.webkit.org/show_bug.cgi?id=223086
+ <rdar://problem/75591816>
+
+ Reviewed by Chris Dumez.
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::diskUsage):
+ * Modules/indexeddb/server/IDBServer.h:
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::databasesSizeForDirectory):
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.h:
+ * storage/StorageQuotaManager.cpp:
+ (WebCore::StorageQuotaManager::requestSpaceOnBackgroundThread):
+ (WebCore::StorageQuotaManager::tryGrantRequest):
+ (WebCore::StorageQuotaManager::setLoggingEnabled): Deleted.
+ * storage/StorageQuotaManager.h:
+
2021-04-08 Antti Koivisto <[email protected]>
Revert r273621 because iPhone PLT regression
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (275658 => 275659)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -758,14 +758,13 @@
return result;
}
-uint64_t IDBServer::diskUsage(const String& rootDirectory, const ClientOrigin& origin, StorageQuotaManager::ShouldPrintUsageDetail shouldPrintUsageDetail)
+uint64_t IDBServer::diskUsage(const String& rootDirectory, const ClientOrigin& origin)
{
ASSERT(!isMainThread());
auto oldVersionOriginDirectory = IDBDatabaseIdentifier::databaseDirectoryRelativeToRoot(origin.topOrigin, origin.clientOrigin, rootDirectory, "v0"_str);
auto newVersionOriginDirectory = IDBDatabaseIdentifier::databaseDirectoryRelativeToRoot(origin.topOrigin, origin.clientOrigin, rootDirectory, "v1"_str);
- bool shouldPrintUsageDetailForDirectory = shouldPrintUsageDetail == StorageQuotaManager::ShouldPrintUsageDetail::Yes;
- return SQLiteIDBBackingStore::databasesSizeForDirectory(oldVersionOriginDirectory, shouldPrintUsageDetailForDirectory) + SQLiteIDBBackingStore::databasesSizeForDirectory(newVersionOriginDirectory, shouldPrintUsageDetailForDirectory);
+ return SQLiteIDBBackingStore::databasesSizeForDirectory(oldVersionOriginDirectory) + SQLiteIDBBackingStore::databasesSizeForDirectory(newVersionOriginDirectory);
}
void IDBServer::upgradeFilesIfNecessary()
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (275658 => 275659)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -106,7 +106,7 @@
WEBCORE_EXPORT void renameOrigin(const WebCore::SecurityOriginData&, const WebCore::SecurityOriginData&);
StorageQuotaManager::Decision requestSpace(const ClientOrigin&, uint64_t taskSize);
- WEBCORE_EXPORT static uint64_t diskUsage(const String& rootDirectory, const ClientOrigin&, StorageQuotaManager::ShouldPrintUsageDetail);
+ WEBCORE_EXPORT static uint64_t diskUsage(const String& rootDirectory, const ClientOrigin&);
WEBCORE_EXPORT void stopDatabaseActivitiesOnMainThread();
Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (275658 => 275659)
--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1278,7 +1278,7 @@
return databaseNameAndVersion ? databaseNameAndVersion->version : 0;
}
-uint64_t SQLiteIDBBackingStore::databasesSizeForDirectory(const String& directory, bool shouldPrintUsageDetail)
+uint64_t SQLiteIDBBackingStore::databasesSizeForDirectory(const String& directory)
{
uint64_t diskUsage = 0;
for (auto& dbDirectory : FileSystem::listDirectory(directory, "*")) {
@@ -1285,11 +1285,6 @@
for (auto& file : FileSystem::listDirectory(dbDirectory, "*.sqlite3"_s)) {
auto fileSize = SQLiteFileSystem::getDatabaseFileSize(file);
diskUsage += fileSize;
- if (shouldPrintUsageDetail) {
- auto databaseNameAndVersion = databaseNameAndVersionFromFile(file);
- String databaseName = databaseNameAndVersion ? databaseNameAndVersion->name : "[UNKNOWN]";
- WTFLogAlways("SQLiteIDBBackingStore::databasesSizeForDirectory filePath='%s', database='%s', size=%" PRIu64, file.utf8().data(), databaseName.utf8().data(), fileSize);
- }
}
}
return diskUsage;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h (275658 => 275659)
--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -96,7 +96,7 @@
IDBError getBlobRecordsForObjectStoreRecord(int64_t objectStoreRecord, Vector<String>& blobURLs, Vector<String>& blobFilePaths);
- static uint64_t databasesSizeForDirectory(const String& directory, bool shouldPrintUsageDetail = false);
+ static uint64_t databasesSizeForDirectory(const String& directory);
String databaseDirectory() const { return m_databaseDirectory; };
static String fullDatabasePathForDirectory(const String&);
Modified: trunk/Source/WebCore/storage/StorageQuotaManager.cpp (275658 => 275659)
--- trunk/Source/WebCore/storage/StorageQuotaManager.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/storage/StorageQuotaManager.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -78,8 +78,7 @@
if (tryGrantRequest(spaceRequested))
return Decision::Grant;
- auto shouldPrintUsageDetail = m_loggingEnabled ? ShouldPrintUsageDetail::Yes : ShouldPrintUsageDetail::No;
- m_usage = m_usageGetter(shouldPrintUsageDetail);
+ m_usage = m_usageGetter();
updateQuotaBasedOnUsage();
m_quotaCountDown = m_usage < m_quota ? m_quota - m_usage : 0;
if (tryGrantRequest(spaceRequested))
@@ -102,7 +101,7 @@
semaphore.wait();
- m_usage = m_usageGetter(shouldPrintUsageDetail);
+ m_usage = m_usageGetter();
m_quotaCountDown = m_usage < m_quota ? m_quota - m_usage : 0;
return tryGrantRequest(spaceRequested) ? Decision::Grant : Decision::Deny;
}
@@ -111,9 +110,6 @@
{
ASSERT(m_quotaCountDownLock.isLocked());
- if (m_loggingEnabled)
- WTFLogAlways("%p - StorageQuotaManager tryGrantRequest m_quota %" PRIu64 ", m_usage %" PRIu64 ", m_quotaCountDown %" PRIu64 ", spaceRequested %" PRIu64, this, m_quota, m_usage, m_quotaCountDown, spaceRequested);
-
if (spaceRequested <= m_quotaCountDown) {
m_quotaCountDown -= spaceRequested;
return true;
@@ -148,9 +144,4 @@
m_quotaCountDown = 0;
}
-void StorageQuotaManager::setLoggingEnabled(bool enabled)
-{
- m_loggingEnabled = enabled;
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/storage/StorageQuotaManager.h (275658 => 275659)
--- trunk/Source/WebCore/storage/StorageQuotaManager.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebCore/storage/StorageQuotaManager.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -37,8 +37,7 @@
class StorageQuotaManager : public ThreadSafeRefCounted<StorageQuotaManager>, public CanMakeWeakPtr<StorageQuotaManager> {
WTF_MAKE_FAST_ALLOCATED;
public:
- enum class ShouldPrintUsageDetail { No, Yes };
- using UsageGetter = Function<uint64_t(ShouldPrintUsageDetail)>;
+ using UsageGetter = Function<uint64_t()>;
using QuotaIncreaseRequester = Function<void(uint64_t currentQuota, uint64_t currentUsage, uint64_t requestedIncrease, CompletionHandler<void(Optional<uint64_t>)>&&)>;
WEBCORE_EXPORT static Ref<StorageQuotaManager> create(uint64_t quota, UsageGetter&&, QuotaIncreaseRequester&&);
@@ -53,8 +52,6 @@
WEBCORE_EXPORT void resetQuotaUpdatedBasedOnUsageForTesting();
WEBCORE_EXPORT void resetQuotaForTesting();
- WEBCORE_EXPORT void setLoggingEnabled(bool);
-
private:
StorageQuotaManager(uint64_t quota, UsageGetter&&, QuotaIncreaseRequester&&);
bool tryGrantRequest(uint64_t);
@@ -75,7 +72,6 @@
// Test only.
uint64_t m_initialQuota { 0 };
- bool m_loggingEnabled { false };
};
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (275658 => 275659)
--- trunk/Source/WebKit/ChangeLog 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/ChangeLog 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1,3 +1,26 @@
+2021-04-08 Sihui Liu <[email protected]>
+
+ Remove logging for investigating http/tests/IndexedDB/storage-limit-1.html failure
+ https://bugs.webkit.org/show_bug.cgi?id=223086
+ <rdar://problem/75591816>
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::storageQuotaManager):
+ (WebKit::NetworkProcess::setQuotaLoggingEnabled): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+ (WKWebsiteDataStoreSetQuotaLoggingEnabled): Deleted.
+ * UIProcess/API/C/WKWebsiteDataStoreRef.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::setQuotaLoggingEnabled): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::setQuotaLoggingEnabled): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
2021-04-08 Kimmo Kinnunen <[email protected]>
Difficult to understand which IPC message caused an ASSERT due to being not handled
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (275658 => 275659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -2397,20 +2397,6 @@
completionHandler();
}
-void NetworkProcess::setQuotaLoggingEnabled(PAL::SessionID sessionID, bool enabled, CompletionHandler<void()>&& completionHandler)
-{
- if (m_quotaLoggingEnabled == enabled)
- return completionHandler();
- m_quotaLoggingEnabled = enabled;
-
- LockHolder locker(m_sessionStorageQuotaManagersLock);
- if (auto* sessionStorageQuotaManager = m_sessionStorageQuotaManagers.get(sessionID)) {
- for (auto storageQuotaManager : sessionStorageQuotaManager->existingStorageQuotaManagers())
- storageQuotaManager->setLoggingEnabled(m_quotaLoggingEnabled);
- }
- completionHandler();
-}
-
void NetworkProcess::renameOriginInWebsiteData(PAL::SessionID sessionID, const URL& oldName, const URL& newName, OptionSet<WebsiteDataType> dataTypes, CompletionHandler<void()>&& completionHandler)
{
auto aggregator = CallbackAggregator::create(WTFMove(completionHandler));
@@ -2514,16 +2500,10 @@
return nullptr;
String idbRootPath = sessionStorageQuotaManager->idbRootPath();
- StorageQuotaManager::UsageGetter usageGetter = [cacheRootPath = sessionStorageQuotaManager->cacheRootPath().isolatedCopy(), idbRootPath = idbRootPath.isolatedCopy(), origin = origin.isolatedCopy()](StorageQuotaManager::ShouldPrintUsageDetail shouldPrintUsageDetail) {
+ StorageQuotaManager::UsageGetter usageGetter = [cacheRootPath = sessionStorageQuotaManager->cacheRootPath().isolatedCopy(), idbRootPath = idbRootPath.isolatedCopy(), origin = origin.isolatedCopy()]() {
ASSERT(!isMainRunLoop());
- uint64_t cacheUsage = CacheStorage::Engine::diskUsage(cacheRootPath, origin);
- uint64_t usage = cacheUsage + IDBServer::IDBServer::diskUsage(idbRootPath, origin, shouldPrintUsageDetail);
-
- if (shouldPrintUsageDetail == StorageQuotaManager::ShouldPrintUsageDetail::Yes)
- WTFLogAlways("StorageQuotaManager::UsageGetter Cache usage %" PRIu64 ", IDB usage %" PRIu64, cacheUsage, usage - cacheUsage);
-
- return usage;
+ return CacheStorage::Engine::diskUsage(cacheRootPath, origin) + IDBServer::IDBServer::diskUsage(idbRootPath, origin);
};
StorageQuotaManager::QuotaIncreaseRequester quotaIncreaseRequester = [this, weakThis = makeWeakPtr(*this), sessionID, origin] (uint64_t currentQuota, uint64_t currentSpace, uint64_t requestedIncrease, auto&& callback) {
ASSERT(isMainRunLoop());
@@ -2533,7 +2513,6 @@
};
auto originStorageQuotaManager = sessionStorageQuotaManager->ensureOriginStorageQuotaManager(origin, sessionStorageQuotaManager->defaultQuota(origin), WTFMove(usageGetter), WTFMove(quotaIncreaseRequester)).ptr();
- originStorageQuotaManager->setLoggingEnabled(m_quotaLoggingEnabled);
return originStorageQuotaManager;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (275658 => 275659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -303,7 +303,6 @@
void syncLocalStorage(CompletionHandler<void()>&&);
void resetQuota(PAL::SessionID, CompletionHandler<void()>&&);
- void setQuotaLoggingEnabled(PAL::SessionID, bool enabled, CompletionHandler<void()>&&);
void renameOriginInWebsiteData(PAL::SessionID, const URL&, const URL&, OptionSet<WebsiteDataType>, CompletionHandler<void()>&&);
#if ENABLE(SERVICE_WORKER)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (275658 => 275659)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2021-04-08 16:14:46 UTC (rev 275659)
@@ -179,7 +179,6 @@
ResetServiceWorkerFetchTimeoutForTesting() -> () Synchronous
ResetQuota(PAL::SessionID sessionID) -> () Async
- SetQuotaLoggingEnabled(PAL::SessionID sessionID, bool enabled) -> () Async
#if ENABLE(APP_BOUND_DOMAINS)
HasAppBoundSession(PAL::SessionID sessionID) -> (bool hasAppBoundSession) Async
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -838,14 +838,6 @@
});
}
-void WKWebsiteDataStoreSetQuotaLoggingEnabled(WKWebsiteDataStoreRef dataStoreRef, bool enabled, void* context, WKWebsiteDataStoreSetQuotaLoggingEnabledCallback callback)
-{
- WebKit::toImpl(dataStoreRef)->setQuotaLoggingEnabled(enabled, [context, callback] {
- if (callback)
- callback(context);
- });
-}
-
void WKWebsiteDataStoreClearAppBoundSession(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreClearAppBoundSessionFunction completionHandler)
{
#if ENABLE(APP_BOUND_DOMAINS)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -194,9 +194,6 @@
typedef void (*WKWebsiteDataStoreResetQuotaCallback)(void* functionContext);
WK_EXPORT void WKWebsiteDataStoreResetQuota(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreResetQuotaCallback callback);
-typedef void (*WKWebsiteDataStoreSetQuotaLoggingEnabledCallback)(void* functionContext);
-WK_EXPORT void WKWebsiteDataStoreSetQuotaLoggingEnabled(WKWebsiteDataStoreRef dataStoreRef, bool enabled, void* context, WKWebsiteDataStoreSetQuotaLoggingEnabledCallback callback);
-
typedef void (*WKWebsiteDataStoreClearAppBoundSessionFunction)(void* functionContext);
WK_EXPORT void WKWebsiteDataStoreClearAppBoundSession(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreClearAppBoundSessionFunction completionHandler);
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1545,11 +1545,6 @@
sendWithAsyncReply(Messages::NetworkProcess::ResetQuota(sessionID), WTFMove(completionHandler));
}
-void NetworkProcessProxy::setQuotaLoggingEnabled(PAL::SessionID sessionID, bool enabled, CompletionHandler<void()>&& completionHandler)
-{
- sendWithAsyncReply(Messages::NetworkProcess::SetQuotaLoggingEnabled(sessionID, enabled), WTFMove(completionHandler));
-}
-
#if ENABLE(APP_BOUND_DOMAINS)
void NetworkProcessProxy::hasAppBoundSession(PAL::SessionID sessionID, CompletionHandler<void(bool)>&& completionHandler)
{
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -241,7 +241,6 @@
void networkProcessDidTerminate(TerminationReason);
void resetQuota(PAL::SessionID, CompletionHandler<void()>&&);
- void setQuotaLoggingEnabled(PAL::SessionID, bool enabled, CompletionHandler<void()>&&);
void resourceLoadDidSendRequest(WebPageProxyIdentifier, ResourceLoadInfo&&, WebCore::ResourceRequest&&, Optional<IPC::FormDataReference>&&);
void resourceLoadDidPerformHTTPRedirection(WebPageProxyIdentifier, ResourceLoadInfo&&, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -2074,12 +2074,6 @@
networkProcess().resetQuota(m_sessionID, [callbackAggregator] { });
}
-void WebsiteDataStore::setQuotaLoggingEnabled(bool enabled, CompletionHandler<void()>&& completionHandler)
-{
- auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
- networkProcess().setQuotaLoggingEnabled(m_sessionID, enabled, [callbackAggregator] { });
-}
-
#if !PLATFORM(COCOA)
WTF::String WebsiteDataStore::defaultMediaCacheDirectory()
{
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (275658 => 275659)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -338,7 +338,6 @@
static bool http3Enabled();
void resetQuota(CompletionHandler<void()>&&);
- void setQuotaLoggingEnabled(bool enabled, CompletionHandler<void()>&&);
#if ENABLE(APP_BOUND_DOMAINS)
void hasAppBoundSession(CompletionHandler<void(bool)>&&) const;
Modified: trunk/Source/WebKitLegacy/ChangeLog (275658 => 275659)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1,3 +1,14 @@
+2021-04-08 Sihui Liu <[email protected]>
+
+ Remove logging for investigating http/tests/IndexedDB/storage-limit-1.html failure
+ https://bugs.webkit.org/show_bug.cgi?id=223086
+ <rdar://problem/75591816>
+
+ Reviewed by Chris Dumez.
+
+ * Storage/InProcessIDBServer.cpp:
+ (InProcessIDBServer::quotaManager):
+
2021-04-05 Alex Christensen <[email protected]>
Resurrect Mac CMake build
Modified: trunk/Source/WebKitLegacy/Storage/InProcessIDBServer.cpp (275658 => 275659)
--- trunk/Source/WebKitLegacy/Storage/InProcessIDBServer.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Source/WebKitLegacy/Storage/InProcessIDBServer.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -72,7 +72,7 @@
StorageQuotaManager* InProcessIDBServer::quotaManager(const ClientOrigin& origin)
{
return m_quotaManagers.ensure(origin, [] {
- return StorageQuotaManager::create(StorageQuotaManager::defaultQuota(), [](auto) {
+ return StorageQuotaManager::create(StorageQuotaManager::defaultQuota(), [] {
return 0;
}, [](uint64_t quota, uint64_t currentSpace, uint64_t spaceIncrease, auto callback) {
callback(quota + currentSpace + spaceIncrease);
Modified: trunk/Tools/ChangeLog (275658 => 275659)
--- trunk/Tools/ChangeLog 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/ChangeLog 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1,3 +1,21 @@
+2021-04-08 Sihui Liu <[email protected]>
+
+ Remove logging for investigating http/tests/IndexedDB/storage-limit-1.html failure
+ https://bugs.webkit.org/show_bug.cgi?id=223086
+ <rdar://problem/75591816>
+
+ Reviewed by Chris Dumez.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setQuotaLoggingEnabled): Deleted.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::setQuotaLoggingEnabled): Deleted.
+ * WebKitTestRunner/TestController.h:
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
2021-04-08 Simon Fraser <[email protected]>
Copy-constructed Vectors should not have excess capacity
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2021-04-08 16:14:46 UTC (rev 275659)
@@ -131,7 +131,6 @@
// Local storage API
undefined clearAllDatabases();
undefined setDatabaseQuota(unsigned long long quota);
- undefined setQuotaLoggingEnabled(boolean enabled);
DOMString pathToLocalResource(DOMString url);
undefined syncLocalStorage();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -383,11 +383,6 @@
return WKBundleSetDatabaseQuota(InjectedBundle::singleton().bundle(), quota);
}
-void TestRunner::setQuotaLoggingEnabled(bool enabled)
-{
- postSynchronousPageMessage("SetQuotaLoggingEnabled", enabled);
-}
-
void TestRunner::syncLocalStorage()
{
postSynchronousMessage("SyncLocalStorage", true);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -141,7 +141,6 @@
// Local storage
void clearAllDatabases();
void setDatabaseQuota(uint64_t);
- void setQuotaLoggingEnabled(bool);
JSRetainPtr<JSStringRef> pathToLocalResource(JSStringRef);
void syncLocalStorage();
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -2910,13 +2910,6 @@
runUntil(context.done, noTimeout);
}
-void TestController::setQuotaLoggingEnabled(bool enabled)
-{
- StorageVoidCallbackContext context(*this);
- WKWebsiteDataStoreSetQuotaLoggingEnabled(TestController::websiteDataStore(), enabled, &context, StorageVoidCallback);
- runUntil(context.done, noTimeout);
-}
-
struct FetchCacheOriginsCallbackContext {
FetchCacheOriginsCallbackContext(TestController& controller, WKStringRef origin)
: testController(controller)
Modified: trunk/Tools/WebKitTestRunner/TestController.h (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/TestController.h 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2021-04-08 16:14:46 UTC (rev 275659)
@@ -281,7 +281,6 @@
void terminateServiceWorkers();
void resetQuota();
- void setQuotaLoggingEnabled(bool);
void removeAllSessionCredentials();
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (275658 => 275659)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2021-04-08 16:14:00 UTC (rev 275658)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2021-04-08 16:14:46 UTC (rev 275659)
@@ -1391,11 +1391,6 @@
return nullptr;
}
- if (WKStringIsEqualToUTF8CString(messageName, "SetQuotaLoggingEnabled")) {
- TestController::singleton().setQuotaLoggingEnabled(messageBody);
- return nullptr;
- }
-
ASSERT_NOT_REACHED();
return nullptr;
}
