Changeset 242727 in webkit

Timestamp:

Mar 11, 2019, 12:38:04 PM (7 years ago)

Author:

youenn@apple.com

Message:

Allow storage quota increase by default in WTR
​https://bugs.webkit.org/show_bug.cgi?id=195541

Reviewed by Geoffrey Garen.

Tools:

Allow storage quota increase by default in WTR.
Move from testRunner.allowStorageQuotaIncrease to testRunner.setAllowStorageQuotaIncrease.
Use this for tests that explicitly need cache increase.

Instead of increasing quota by 2, make sure the next request is
granted by adding all given parameters.

• WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setAllowStorageQuotaIncrease):
(WTR::TestRunner::allowCacheStorageQuotaIncrease): Deleted.

• WebKitTestRunner/InjectedBundle/TestRunner.h:
• WebKitTestRunner/TestController.cpp:

(WTR::TestController::setAllowStorageQuotaIncrease):
(WTR::TestController::allowCacheStorageQuotaIncrease): Deleted.

• WebKitTestRunner/TestController.h:
• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

• WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::TestController::cocoaResetStateToConsistentValues):
(WTR::TestController::setAllowStorageQuotaIncrease):
(WTR::TestController::allowCacheStorageQuotaIncrease): Deleted.

• WebKitTestRunner/cocoa/TestWebsiteDataStoreDelegate.mm:

(-[TestWebsiteDataStoreDelegate requestStorageSpace:frameOrigin:quota:currentSize:spaceRequired:decisionHandler:]):

LayoutTests:

• http/wpt/cache-storage/cache-quota.any.js:

(promise_test):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/cache-storage/cache-quota.any.js (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/cocoa/TestWebsiteDataStoreDelegate.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-11  Youenn Fablet  <youenn@apple.com>
+
+        Allow storage quota increase by default in WTR
+        https://bugs.webkit.org/show_bug.cgi?id=195541
+
+        Reviewed by Geoffrey Garen.
+
+        * http/wpt/cache-storage/cache-quota.any.js:
+        (promise_test):
+
 2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/http/wpt/cache-storage/cache-quota.any.js

@@ -4 +4 @@
 var test_url = 'https://example.com/foo';
 var test_body = 'Hello world!';
+
+if (window.testRunner)
+    testRunner.setAllowStorageQuotaIncrease(false);
 
 function getResponseBodySizeWithPadding(response)
@@ -129 +132 @@
 
 promise_test((test) => {
-    if (!window.internals)
+    if (!window.internals || !window.testRunner)
         return Promise.reject("Test requires internals");
 
@@ -153 +156 @@
         });
     }).then(() => {
-        testRunner.allowCacheStorageQuotaIncrease();
+        testRunner.setAllowStorageQuotaIncrease(true);
         return cache.put("1ko", response1ko.clone());
     }).then(() => {

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-11  Youenn Fablet  <youenn@apple.com>
+
+        Allow storage quota increase by default in WTR
+        https://bugs.webkit.org/show_bug.cgi?id=195541
+
+        Reviewed by Geoffrey Garen.
+
+        Allow storage quota increase by default in WTR.
+        Move from testRunner.allowStorageQuotaIncrease to testRunner.setAllowStorageQuotaIncrease.
+        Use this for tests that explicitly need cache increase.
+
+        Instead of increasing quota by 2, make sure the next request is
+        granted by adding all given parameters.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setAllowStorageQuotaIncrease):
+        (WTR::TestRunner::allowCacheStorageQuotaIncrease): Deleted.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::setAllowStorageQuotaIncrease):
+        (WTR::TestController::allowCacheStorageQuotaIncrease): Deleted.
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::TestController::cocoaResetStateToConsistentValues):
+        (WTR::TestController::setAllowStorageQuotaIncrease):
+        (WTR::TestController::allowCacheStorageQuotaIncrease): Deleted.
+        * WebKitTestRunner/cocoa/TestWebsiteDataStoreDelegate.mm:
+        (-[TestWebsiteDataStoreDelegate requestStorageSpace:frameOrigin:quota:currentSize:spaceRequired:decisionHandler:]):
+
 2019-03-11  Xan Lopez  <xan@igalia.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -64 +64 @@
     boolean hasDOMCache(DOMString origin);
     unsigned long domCacheSize(DOMString origin);
-    void allowCacheStorageQuotaIncrease();
+    void setAllowStorageQuotaIncrease(boolean value);
 
     // Special options.

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -2420 +2420 @@
 }
 
-void TestRunner::allowCacheStorageQuotaIncrease()
-{
-    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("AllowCacheStorageQuotaIncrease"));
-    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), nullptr, nullptr);
+void TestRunner::setAllowStorageQuotaIncrease(bool willIncrease)
+{
+    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetAllowStorageQuotaIncrease"));
+    WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(willIncrease));
+    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -176 +176 @@
     bool hasDOMCache(JSStringRef origin);
     uint64_t domCacheSize(JSStringRef origin);
-    void allowCacheStorageQuotaIncrease();
+    void setAllowStorageQuotaIncrease(bool);
 
     // IndexedDB

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -3041 +3041 @@
 
 #if !PLATFORM(COCOA)
-void TestController::allowCacheStorageQuotaIncrease()
+void TestController::setAllowStorageQuotaIncrease(bool)
 {
     // FIXME: To implement.

trunk/Tools/WebKitTestRunner/TestController.h

@@ -263 +263 @@
     bool hasDOMCache(WKStringRef origin);
     uint64_t domCacheSize(WKStringRef origin);
-    void allowCacheStorageQuotaIncrease();
+
+    void setAllowStorageQuotaIncrease(bool);
 
     void setIDBPerOriginQuota(uint64_t);

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -1464 +1464 @@
     }
 
-    if (WKStringIsEqualToUTF8CString(messageName, "AllowCacheStorageQuotaIncrease")) {
-        TestController::singleton().allowCacheStorageQuotaIncrease();
+    if (WKStringIsEqualToUTF8CString(messageName, "SetAllowStorageQuotaIncrease")) {
+        ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
+        auto canIncrease = WKBooleanGetValue(static_cast<WKBooleanRef>(messageBody));
+        TestController::singleton().setAllowStorageQuotaIncrease(canIncrease);
         return nullptr;
     }

trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

@@ -243 +243 @@
     }
 
-    [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota: false];
+    [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota: true];
 }
 
@@ -370 +370 @@
 }
 
-void TestController::allowCacheStorageQuotaIncrease()
-{
-    [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota: true];
+void TestController::setAllowStorageQuotaIncrease(bool value)
+{
+    [globalWebsiteDataStoreDelegateClient setAllowRaisingQuota: value];
 }
 

trunk/Tools/WebKitTestRunner/cocoa/TestWebsiteDataStoreDelegate.mm

@@ -34 +34 @@
 }
 
-- (void)requestStorageSpace:(NSURL *)mainFrameURL frameOrigin:(NSURL *)frameURL quota:(NSUInteger)quota currentSize:(NSUInteger)currentSize spaceRequired:(NSUInteger)spaceRequired decisionHandler:(void (^)(unsigned long long quota))decisionHandler
+- (void)requestStorageSpace:(NSURL *)mainFrameURL frameOrigin:(NSURL *)frameURL quota:(NSUInteger)quota currentSize:(NSUInteger)currentSize spaceRequired:(NSUInteger)spaceRequired decisionHandler:(void (^)(unsigned long long))decisionHandler
 {
-    decisionHandler(_shouldAllowRaisingQuota ? 2 * quota : quota);
+    decisionHandler(_shouldAllowRaisingQuota ? quota + currentSize + spaceRequired : quota);
 }