Changeset 245698 in webkit

Timestamp:

May 23, 2019 11:08:01 AM (5 years ago)

Author:

youenn@apple.com

Message:

Set default WebsiteDataStore storage quota based on StorageQuotaManager
​https://bugs.webkit.org/show_bug.cgi?id=198133
<rdar://problem/51031436>

Reviewed by Geoffrey Garen.

Source/WebKit:

• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:

(doTest):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-23  Youenn Fablet  <youenn@apple.com>
+
+        Set default WebsiteDataStore storage quota based on StorageQuotaManager
+        https://bugs.webkit.org/show_bug.cgi?id=198133
+        <rdar://problem/51031436>
+
+        Reviewed by Geoffrey Garen.
+
+        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
+
 2019-05-23  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h

@@ -27 +27 @@
 
 #include "APIObject.h"
+#include <WebCore/StorageQuotaManager.h>
 #include <wtf/URL.h>
 #include <wtf/text/WTFString.h>
@@ -98 +99 @@
     void setHTTPSProxy(URL&& proxy) { m_httpsProxy = WTFMove(proxy); }
 
-    constexpr static uint64_t defaultPerOriginStorageQuota = 50 * 1024 * 1024;
-
 private:
     WebsiteDataStoreConfiguration();
 
     String m_cacheStorageDirectory;
-    uint64_t m_perOriginStorageQuota { defaultPerOriginStorageQuota };
+    uint64_t m_perOriginStorageQuota { WebCore::StorageQuotaManager::defaultQuota() };
     String m_networkCacheDirectory;
     String m_applicationCacheDirectory;

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-23  Youenn Fablet  <youenn@apple.com>
+
+        Set default WebsiteDataStore storage quota based on StorageQuotaManager
+        https://bugs.webkit.org/show_bug.cgi?id=198133
+        <rdar://problem/51031436>
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm:
+        (doTest):
+
 2019-05-23  Keith Rollin  <krollin@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm

@@ -29 +29 @@
 #import "PlatformUtilities.h"
 #import "Test.h"
+#import "TestNavigationDelegate.h"
 #import "TestWKWebView.h"
 #import <WebKit/WKPreferencesPrivate.h>
@@ -42 +43 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/Vector.h>
+#include <wtf/text/StringConcatenateNumbers.h>
 #import <wtf/text/StringHash.h>
 #import <wtf/text/WTFString.h>
 
 using namespace TestWebKitAPI;
+
+static bool didFinishNavigation;
 
 @interface QuotaDelegate : NSObject <WKUIDelegate>
@@ -183 +187 @@
 )SWRESOURCE";
 
+static const char* TestUrlBytes = R"SWRESOURCE(
+<script>
+
+var index = 0;
+async function test(num)
+{
+    index++;
+    url = "http://example.org/test" + index;
+
+    const cache = await window.caches.open("mycache");
+    const promise = cache.put(url, new Response(new ArrayBuffer(num * 1024 * 1024)));
+    promise.then(() => {
+        window.webkit.messageHandlers.qt.postMessage("pass");
+    }, () => {
+        window.webkit.messageHandlers.qt.postMessage("fail");
+    });
+}
+
+function doTest(num)
+{
+    test(num);
+}
+</script>
+)SWRESOURCE";
+
 static bool done;
 
@@ -350 +379 @@
     EXPECT_FALSE(receivedQuotaDelegateCalled);
 }
+
+TEST(WebKit, DefaultQuota)
+{
+    done = false;
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
+
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+
+    auto messageHandler = adoptNS([[QuotaMessageHandler alloc] init]);
+    [[configuration userContentController] addScriptMessageHandler:messageHandler.get() name:@"qt"];
+
+    auto handler = adoptNS([[StorageSchemes alloc] init]);
+    handler->resources.set("qt://test1.html", ResourceInfo { @"text/html", TestUrlBytes });
+    [configuration setURLSchemeHandler:handler.get() forURLScheme:@"QT"];
+    [configuration.get().processPool _registerURLSchemeServiceWorkersCanHandle:@"qt"];
+
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get() addToWindow:YES]);
+    auto delegate = adoptNS([[QuotaDelegate alloc] init]);
+    [webView setUIDelegate:delegate.get()];
+    setVisible(webView.get());
+
+    auto navigationDelegate = adoptNS([[TestNavigationDelegate alloc] init]);
+    [navigationDelegate setDidFinishNavigation:^(WKWebView *, WKNavigation *) {
+        didFinishNavigation = true;
+    }];
+    [webView setNavigationDelegate:navigationDelegate.get()];
+
+    didFinishNavigation = false;
+    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"qt://test1.html"]]];
+    Util::run(&didFinishNavigation);
+
+    receivedQuotaDelegateCalled = false;
+
+    // Storing 10 entries of 10 MB should not hit the default quota which is 1GB
+    for (int i = 0; i < 10; ++i) {
+        [webView stringByEvaluatingJavaScript:makeString("doTest(10)")];
+        [messageHandler setExpectedMessage: @"pass"];
+        receivedMessage = false;
+        Util::run(&receivedMessage);
+    }
+    EXPECT_FALSE(receivedQuotaDelegateCalled);
+}