Attachment 366619 Details for Bug 196545 – Patch

[patch] Patch

bug-196545-20190403100221.patch (text/plain), 23.42 KB, created by youenn fablet on 2019-04-03 10:02:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-04-03 10:02:22 PDT

Size: 23.42 KB

patch

obsolete

>Subversion Revision: 243697
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 0b0b84aced04a5b4947737b17c49c715a462e825..51ea2688023a83b75b77219e4abe62cada026dd4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-04-03  Youenn Fablet  <youenn@apple.com>
>+
>+        Remove IDB-specific quota
>+        https://bugs.webkit.org/show_bug.cgi?id=196545
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::createIDBServer):
>+        (WebKit::NetworkProcess::addIndexedDatabaseSession):
>+        (WebKit::NetworkProcess::setIDBPerOriginQuota): Deleted.
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcess.messages.in:
>+        * UIProcess/API/C/WKContext.cpp:
>+        (WKContextSetIDBPerOriginQuota): Deleted.
>+        * UIProcess/API/C/WKContextPrivate.h:
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::setIDBPerOriginQuota): Deleted.
>+        * UIProcess/WebProcessPool.h:
>+
> 2019-04-03  Youenn Fablet  <youenn@apple.com>
> 
>         Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index 25fe35b03e550b72c08d46673fdfb9dc19b5a2f1..913811a119a198ff4c8b09290d8d4fdc2a7d0b19 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-03  Youenn Fablet  <youenn@apple.com>
>+
>+        Remove IDB-specific quota
>+        https://bugs.webkit.org/show_bug.cgi?id=196545
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Storage/WebDatabaseProvider.cpp:
>+        (WebDatabaseProvider::idbConnectionToServerForSession):
>+        (WebDatabaseProvider::deleteAllDatabases):
>+        (WebDatabaseProvider::setIDBPerOriginQuota): Deleted.
>+        * Storage/WebDatabaseProvider.h:
>+
> 2019-03-13  Youenn Fablet  <youenn@apple.com>
> 
>         Check IDB quota usage through QuotaManager
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index d19dcdaf4a5388e43dac8402e7963530fde44c24..e0ecf903161ddefa548e74fd2b1c3d0070f0d752 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-04-03  Youenn Fablet  <youenn@apple.com>
>+
>+        Remove IDB-specific quota
>+        https://bugs.webkit.org/show_bug.cgi?id=196545
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Storage/WebDatabaseManager.mm:
>+        (-[WebDatabaseManager setIDBPerOriginQuota:]): Deleted.
>+        * Storage/WebDatabaseManagerPrivate.h:
>+
> 2019-03-31  Sam Weinig  <weinig@apple.com>
> 
>         Remove more i386 specific configurations
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 1cb4b674baf3c02a3cf2ec2b6c9275e2d949cdfb..e9323771710b44f7c20b784f7a99aa8ca3a0cc90 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -2118,7 +2118,7 @@ Ref<IDBServer::IDBServer> NetworkProcess::createIDBServer(PAL::SessionID session
>         path = m_idbDatabasePaths.get(sessionID);
>     }
> 
>-    auto server = IDBServer::IDBServer::create(sessionID, path, *this, [this, weakThis = makeWeakPtr(this)](PAL::SessionID sessionID, const auto& origin) -> StorageQuotaManager* {
>+    return IDBServer::IDBServer::create(sessionID, path, *this, [this, weakThis = makeWeakPtr(this)](PAL::SessionID sessionID, const auto& origin) -> StorageQuotaManager* {
>         if (!weakThis)
>             return nullptr;
>         return &this->storageQuotaManager(sessionID, origin);
>@@ -2127,8 +2127,6 @@ Ref<IDBServer::IDBServer> NetworkProcess::createIDBServer(PAL::SessionID session
>             return;
>         this->notifyHoldingLockedFiles(isHoldingLockedFiles);
>     });
>-    server->setPerOriginQuota(m_idbPerOriginQuota);
>-    return server;
> }
> 
> IDBServer::IDBServer& NetworkProcess::idbServer(PAL::SessionID sessionID)
>@@ -2224,14 +2222,6 @@ void NetworkProcess::addIndexedDatabaseSession(PAL::SessionID sessionID, String&
>             postStorageTask(createCrossThreadTask(*this, &NetworkProcess::ensurePathExists, indexedDatabaseDirectory));
>     }
> }
>-
>-void NetworkProcess::setIDBPerOriginQuota(uint64_t quota)
>-{
>-    m_idbPerOriginQuota = quota;
>-    
>-    for (auto& server : m_idbServers.values())
>-        server->setPerOriginQuota(quota);
>-}
> #endif // ENABLE(INDEXED_DATABASE)
> 
> void NetworkProcess::updateQuotaBasedOnSpaceUsageForTesting(PAL::SessionID sessionID, const ClientOrigin& origin)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index 6347c18c7ddfdb3d8f2e1f63fced848734178f93..00e9e36852c19092c596d1a291718420bd790416 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -277,7 +277,6 @@ public:
>     WebCore::IDBServer::IDBServer& idbServer(PAL::SessionID);
>     // WebCore::IDBServer::IDBBackingStoreFileHandler.
>     void accessToTemporaryFileComplete(const String& path) final;
>-    void setIDBPerOriginQuota(uint64_t);
> #endif
>     void updateQuotaBasedOnSpaceUsageForTesting(PAL::SessionID, const WebCore::ClientOrigin&);
> 
>@@ -514,7 +513,6 @@ private:
> #if ENABLE(INDEXED_DATABASE)
>     HashMap<PAL::SessionID, String> m_idbDatabasePaths;
>     HashMap<PAL::SessionID, RefPtr<WebCore::IDBServer::IDBServer>> m_idbServers;
>-    uint64_t m_idbPerOriginQuota { WebCore::IDBServer::defaultPerOriginQuota };
> #endif
> 
>     Deque<CrossThreadTask> m_storageTasks;
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>index dbf3ca7ae2e5b08f08d65a88dc5600fcae53d6bd..de40600c90c76470999bcadee17d2aaf096670b7 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>@@ -161,9 +161,6 @@ messages -> NetworkProcess LegacyReceiver {
>     DisableServiceWorkerProcessTerminationDelay()
> #endif
> 
>-#if ENABLE(INDEXED_DATABASE)
>-    SetIDBPerOriginQuota(uint64_t quota)
>-#endif
>     UpdateQuotaBasedOnSpaceUsageForTesting(PAL::SessionID sessionID, struct WebCore::ClientOrigin origin)
> 
>     StoreAdClickAttribution(PAL::SessionID sessionID, WebCore::AdClickAttribution adClickAttribution)
>diff --git a/Source/WebKit/UIProcess/API/C/WKContext.cpp b/Source/WebKit/UIProcess/API/C/WKContext.cpp
>index 93f76a796107d7c425aa13390890512a0facafd5..6b896103ae0f26e17897314e038a04657395e345 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContext.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKContext.cpp
>@@ -659,11 +659,6 @@ void WKContextClearSupportedPlugins(WKContextRef contextRef)
> #endif
> }
> 
>-void WKContextSetIDBPerOriginQuota(WKContextRef contextRef, uint64_t quota)
>-{
>-    WebKit::toImpl(contextRef)->setIDBPerOriginQuota(quota);
>-}
>-
> void WKContextClearCurrentModifierStateForTesting(WKContextRef contextRef)
> {
>     WebKit::toImpl(contextRef)->clearCurrentModifierStateForTesting();
>diff --git a/Source/WebKit/UIProcess/API/C/WKContextPrivate.h b/Source/WebKit/UIProcess/API/C/WKContextPrivate.h
>index f9c7d3296e5c0cd7f3367de39a031d283fbe6666..0c17b1a112c2ec1f2e850217ab51f664a518aea6 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContextPrivate.h
>+++ b/Source/WebKit/UIProcess/API/C/WKContextPrivate.h
>@@ -116,8 +116,6 @@ WK_EXPORT WKProcessID WKContextGetNetworkProcessIdentifier(WKContextRef context)
> WK_EXPORT void WKContextAddSupportedPlugin(WKContextRef context, WKStringRef domain, WKStringRef name, WKArrayRef mimeTypes, WKArrayRef extensions);
> WK_EXPORT void WKContextClearSupportedPlugins(WKContextRef context);
> 
>-WK_EXPORT void WKContextSetIDBPerOriginQuota(WKContextRef context, uint64_t quota);
>-
> WK_EXPORT void WKContextClearCurrentModifierStateForTesting(WKContextRef context);
> 
> #ifdef __cplusplus
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 4c3f1e74aace34a5a74fe5b872df50c5247a9ac3..932af60692374432da6b8ca9b3d200f82be1a973 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -1754,13 +1754,6 @@ void WebProcessPool::syncNetworkProcessCookies()
>     ensureNetworkProcess().syncAllCookies();
> }
> 
>-void WebProcessPool::setIDBPerOriginQuota(uint64_t quota)
>-{
>-#if ENABLE(INDEXED_DATABASE)
>-    ensureNetworkProcess().send(Messages::NetworkProcess::SetIDBPerOriginQuota(quota), 0);
>-#endif
>-}
>-
> void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
> {
>     ensureNetworkProcess();
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 2157b6b09acc0ca50e861282821b19eaa5ead866..34dc4b12d66ae79d08ce768337e4e657374a21f7 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -299,8 +299,6 @@ public:
> 
>     void syncNetworkProcessCookies();
> 
>-    void setIDBPerOriginQuota(uint64_t);
>-
>     void setShouldMakeNextWebProcessLaunchFailForTesting(bool value) { m_shouldMakeNextWebProcessLaunchFailForTesting = value; }
>     bool shouldMakeNextWebProcessLaunchFailForTesting() const { return m_shouldMakeNextWebProcessLaunchFailForTesting; }
>     void setShouldMakeNextNetworkProcessLaunchFailForTesting(bool value) { m_shouldMakeNextNetworkProcessLaunchFailForTesting = value; }
>diff --git a/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp b/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp
>index 5ee5a7b29bef45399dfd78b3123c0e0b2fc9aca1..2eb7053626df2e77b9b236880209eeab51ce5a97 100644
>--- a/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp
>+++ b/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp
>@@ -45,17 +45,9 @@ WebDatabaseProvider::~WebDatabaseProvider()
> #if ENABLE(INDEXED_DATABASE)
> WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(const PAL::SessionID& sessionID)
> {
>-    auto result = m_idbServerMap.add(sessionID.sessionID(), nullptr);
>-    if (result.isNewEntry) {
>-        if (sessionID.isEphemeral())
>-            result.iterator->value = WebCore::InProcessIDBServer::create(sessionID);
>-        else
>-            result.iterator->value = WebCore::InProcessIDBServer::create(sessionID, indexedDatabaseDirectoryPath());
>-    }
>-
>-    result.iterator->value->idbServer().setPerOriginQuota(m_idbPerOriginQuota);
>-
>-    return result.iterator->value->connectionToServer();
>+    return m_idbServerMap.ensure(sessionID.sessionID(), [&sessionID] {
>+        return sessionID.isEphemeral() ? WebCore::InProcessIDBServer::create(sessionID) : WebCore::InProcessIDBServer::create(sessionID, indexedDatabaseDirectoryPath());
>+    }).iterator->value->connectionToServer();
> }
> 
> void WebDatabaseProvider::deleteAllDatabases()
>@@ -63,13 +55,4 @@ void WebDatabaseProvider::deleteAllDatabases()
>     for (auto& server : m_idbServerMap.values())
>         server->idbServer().closeAndDeleteDatabasesModifiedSince(-WallTime::infinity(), [] { });
> }
>-
>-void WebDatabaseProvider::setIDBPerOriginQuota(uint64_t quota)
>-{
>-    m_idbPerOriginQuota = quota;
>-
>-    for (auto& server : m_idbServerMap.values())
>-        server->idbServer().setPerOriginQuota(quota);
>-}
>-
> #endif
>diff --git a/Source/WebKitLegacy/Storage/WebDatabaseProvider.h b/Source/WebKitLegacy/Storage/WebDatabaseProvider.h
>index 52223309b39be3ecaceb69fc69f2007e2c9b3eda..3f506d76c3bf74534f363df2a47fecbe37e10123 100644
>--- a/Source/WebKitLegacy/Storage/WebDatabaseProvider.h
>+++ b/Source/WebKitLegacy/Storage/WebDatabaseProvider.h
>@@ -44,8 +44,6 @@ public:
>     WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const PAL::SessionID&) override;
> 
>     void deleteAllDatabases();
>-
>-    void setIDBPerOriginQuota(uint64_t);
> #endif
> 
> private:
>@@ -55,6 +53,5 @@ private:
> 
> #if ENABLE(INDEXED_DATABASE)
>     HashMap<uint64_t, RefPtr<WebCore::InProcessIDBServer>> m_idbServerMap;
>-    uint64_t m_idbPerOriginQuota { WebCore::IDBServer::defaultPerOriginQuota };
> #endif
> };
>diff --git a/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm b/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm
>index 6d62a98b97f2ec2414c7db1ad3e70f2d0df13ee4..73e2331ebb6cfaedeea4c1d2f12ad0bad522653c 100644
>--- a/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm
>+++ b/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm
>@@ -157,13 +157,6 @@ static NSString *databasesDirectoryPath();
> #endif
> }
> 
>-- (void)setIDBPerOriginQuota:(uint64_t)quota
>-{
>-#if ENABLE(INDEXED_DATABASE)
>-    WebDatabaseProvider::singleton().setIDBPerOriginQuota(quota);
>-#endif
>-}
>-
> #if PLATFORM(IOS_FAMILY)
> 
> static bool isFileHidden(NSString *file)
>diff --git a/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h b/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h
>index 21724162b95388a4a26ba9ec4d6c504f45f6404a..939b4cf7e05742d36e13077c0ca6632ff3e5dcf2 100644
>--- a/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h
>+++ b/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h
>@@ -70,7 +70,6 @@ extern CFStringRef WebDatabaseOriginsDidChangeNotification;
> 
> // For DumpRenderTree support only
> - (void)deleteAllIndexedDatabases;
>-- (void)setIDBPerOriginQuota:(uint64_t)quota;
> 
> #if TARGET_OS_IPHONE
> + (void)scheduleEmptyDatabaseRemoval;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 117daeafd244ac0719dc4a1e6bde9924579f1366..b8c59ab2b47bfb35cc7c7527b05ab2e1a3c8ff26 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,29 @@
>+2019-04-03  Youenn Fablet  <youenn@apple.com>
>+
>+        Remove IDB-specific quota
>+        https://bugs.webkit.org/show_bug.cgi?id=196545
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/TestRunner.cpp:
>+        (TestRunner::staticFunctions):
>+        (setIDBPerOriginQuotaCallback): Deleted.
>+        * DumpRenderTree/TestRunner.h:
>+        * DumpRenderTree/mac/DumpRenderTree.mm:
>+        (runTest):
>+        * DumpRenderTree/mac/TestRunnerMac.mm:
>+        (TestRunner::setIDBPerOriginQuota): Deleted.
>+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
>+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
>+        (WTR::TestRunner::setIDBPerOriginQuota): Deleted.
>+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::resetStateToConsistentValues):
>+        (WTR::TestController::setIDBPerOriginQuota): Deleted.
>+        * WebKitTestRunner/TestController.h:
>+        * WebKitTestRunner/TestInvocation.cpp:
>+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
>+
> 2019-04-03  Youenn Fablet  <youenn@apple.com>
> 
>         Pass storage quota parameters from UIProcess to NetworkProcess as part of WebsiteDataStore parameters
>diff --git a/Tools/DumpRenderTree/TestRunner.cpp b/Tools/DumpRenderTree/TestRunner.cpp
>index 6222242a0a89031d6da1b8a38f9087a15f7e1ada..5ab7168a49416b3ecb8c79b525f5128688aba264 100644
>--- a/Tools/DumpRenderTree/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/TestRunner.cpp
>@@ -934,20 +934,6 @@ static JSValueRef setDatabaseQuotaCallback(JSContextRef context, JSObjectRef fun
>     return JSValueMakeUndefined(context);
> }
> 
>-static JSValueRef setIDBPerOriginQuotaCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
>-{
>-    if (argumentCount < 1)
>-        return JSValueMakeUndefined(context);
>-    
>-    auto* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
>-    
>-    double quota = JSValueToNumber(context, arguments[0], nullptr);
>-    if (!std::isnan(quota))
>-        controller->setIDBPerOriginQuota(static_cast<uint64_t>(quota));
>-    
>-    return JSValueMakeUndefined(context);
>-}
>-
> static JSValueRef setDefersLoadingCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
> {
>     if (argumentCount < 1)
>@@ -2225,7 +2211,6 @@ JSStaticFunction* TestRunner::staticFunctions()
>         { "setRejectsProtectionSpaceAndContinueForAuthenticationChallenges", setRejectsProtectionSpaceAndContinueForAuthenticationChallengesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setHandlesAuthenticationChallenges", setHandlesAuthenticationChallengesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setIconDatabaseEnabled", setIconDatabaseEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>-        { "setIDBPerOriginQuota", setIDBPerOriginQuotaCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setAutomaticLinkDetectionEnabled", setAutomaticLinkDetectionEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setMainFrameIsFirstResponder", setMainFrameIsFirstResponderCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setMockDeviceOrientation", setMockDeviceOrientationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>diff --git a/Tools/DumpRenderTree/TestRunner.h b/Tools/DumpRenderTree/TestRunner.h
>index 4209190b362dc0dfa272f83f5375b0aab0519f0e..bb63ed5f1808b0a9621df7a475ecaa63a81bacfa 100644
>--- a/Tools/DumpRenderTree/TestRunner.h
>+++ b/Tools/DumpRenderTree/TestRunner.h
>@@ -106,7 +106,6 @@ public:
>     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme);
>     void setDefersLoading(bool);
>     void setIconDatabaseEnabled(bool);
>-    void setIDBPerOriginQuota(uint64_t);
>     void setJavaScriptCanAccessClipboard(bool flag);
>     void setAutomaticLinkDetectionEnabled(bool flag);
>     void setMainFrameIsFirstResponder(bool flag);
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>index 66c3fb9843acacaca3ae332ccf89b2de0e0f2a45..82862002fc0f73223d2a3fe7ffde3123c8e6665f 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>@@ -2026,7 +2026,6 @@ static void runTest(const string& inputLine)
>     gTestRunner->clearAllApplicationCaches();
> 
>     gTestRunner->clearAllDatabases();
>-    gTestRunner->setIDBPerOriginQuota(50 * MB);
> 
>     if (disallowedURLs)
>         CFSetRemoveAllValues(disallowedURLs);
>diff --git a/Tools/DumpRenderTree/mac/TestRunnerMac.mm b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>index 742517cff710520bdaaa17af22ea7b9984a9de33..0bcd555677bcd0224a6ee65763351f9c175c1b27 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -433,11 +433,6 @@ void TestRunner::setDatabaseQuota(unsigned long long quota)
>     [origin release];
> }
> 
>-void TestRunner::setIDBPerOriginQuota(uint64_t quota)
>-{
>-    [[WebDatabaseManager sharedWebDatabaseManager] setIDBPerOriginQuota:quota];
>-}
>-
> void TestRunner::goBack()
> {
>     [[mainFrame webView] goBack];
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>index 087da8465257fbe69d358bf5770ef7232c6955b0..868af5ed5c7b4abb086662745d98934e60b07233 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>@@ -138,9 +138,6 @@ interface TestRunner {
>     attribute double databaseDefaultQuota;
>     attribute double databaseMaxQuota;
> 
>-    // IndexedDB API
>-    void setIDBPerOriginQuota(unsigned long long quota);
>-
>     // Application Cache API
>     void clearAllApplicationCaches();
>     void setAppCacheMaximumSize(unsigned long long size);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index 1c9af331970be4c4675fb6939f947d89a11c1e46..60bc9aea6d1ef1d1500c5f3a6033927c498f7070 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>@@ -416,13 +416,6 @@ void TestRunner::disallowIncreaseForApplicationCacheQuota()
>     m_disallowIncreaseForApplicationCacheQuota = true;
> }
> 
>-void TestRunner::setIDBPerOriginQuota(uint64_t quota)
>-{
>-    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetIDBPerOriginQuota"));
>-    WKRetainPtr<WKUInt64Ref> messageBody(AdoptWK, WKUInt64Create(quota));
>-    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
>-}
>-
> static inline JSValueRef stringArrayToJS(JSContextRef context, WKArrayRef strings)
> {
>     const size_t count = WKArrayGetSize(strings);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>index 84ab21933366d3d7e67c9168ed8d066c16141615..1591ac85d8e5847244ee28322c7aec57f8a5ca52 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>@@ -176,9 +176,6 @@ public:
>     uint64_t domCacheSize(JSStringRef origin);
>     void setAllowStorageQuotaIncrease(bool);
> 
>-    // IndexedDB
>-    void setIDBPerOriginQuota(uint64_t);
>-
>     // Failed load condition testing
>     void forceImmediateCompletion();
> 
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 53d13471433c0f132fa85b15c47e7f858b5da54a..47a63cbb620b7c85decffe1a6d23a68dca2585d3 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -901,7 +901,6 @@ bool TestController::resetStateToConsistentValues(const TestOptions& options, Re
>     WKContextClearCachedCredentials(TestController::singleton().context());
> 
>     ClearIndexedDatabases();
>-    setIDBPerOriginQuota(50 * MB);
> 
>     clearServiceWorkerRegistrations();
>     clearDOMCaches();
>@@ -2986,11 +2985,6 @@ void TestController::clearDOMCaches()
>     runUntil(context.done, noTimeout);
> }
> 
>-void TestController::setIDBPerOriginQuota(uint64_t quota)
>-{
>-    WKContextSetIDBPerOriginQuota(platformContext(), quota);
>-}
>-
> struct RemoveAllIndexedDatabasesCallbackContext {
>     explicit RemoveAllIndexedDatabasesCallbackContext(TestController& controller)
>         : testController(controller)
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index ace6a54102c89bdaec6aa3e3cc0656c59358d59c..f2ca544accdbd016a706177d9ad913f2a3798e38 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -267,8 +267,6 @@ public:
> 
>     void setAllowStorageQuotaIncrease(bool);
> 
>-    void setIDBPerOriginQuota(uint64_t);
>-
>     bool didReceiveServerRedirectForProvisionalNavigation() const { return m_didReceiveServerRedirectForProvisionalNavigation; }
>     void clearDidReceiveServerRedirectForProvisionalNavigation() { m_didReceiveServerRedirectForProvisionalNavigation = false; }
> 
>diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
>index 4c7037b7f5775c667df38b0313c1dac004abe520..ce5a9c3f0531fb4337af1f94bd3f1c2cd1b145db 100644
>--- a/Tools/WebKitTestRunner/TestInvocation.cpp
>+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
>@@ -1493,13 +1493,6 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
>         return nullptr;
>     }
> 
>-    if (WKStringIsEqualToUTF8CString(messageName, "SetIDBPerOriginQuota")) {
>-        ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
>-        WKUInt64Ref quota = static_cast<WKUInt64Ref>(messageBody);
>-        TestController::singleton().setIDBPerOriginQuota(WKUInt64GetValue(quota));
>-        return nullptr;
>-    }
>-
>     if (WKStringIsEqualToUTF8CString(messageName, "InjectUserScript")) {
>         ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
>         WKStringRef script = static_cast<WKStringRef>(messageBody);

Actions: View | Formatted Diff | Diff

Attachments on bug 196545: 366619 | 366621 | 366650 | 366665 | 366847 | 375711 | 376052 | 376569 | 376693