<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[245698] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/245698">245698</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-05-23 11:08:01 -0700 (Thu, 23 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebsiteDataWebsiteDataStoreConfigurationh">trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaStorageQuotamm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (245697 => 245698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-23 18:07:49 UTC (rev 245697)
+++ trunk/Source/WebKit/ChangeLog       2019-05-23 18:08:01 UTC (rev 245698)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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:
+
</ins><span class="cx"> 2019-05-23  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Deprecate more preview API
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebsiteDataWebsiteDataStoreConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (245697 => 245698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h        2019-05-23 18:07:49 UTC (rev 245697)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h   2019-05-23 18:08:01 UTC (rev 245698)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "APIObject.h"
</span><ins>+#include <WebCore/StorageQuotaManager.h>
</ins><span class="cx"> #include <wtf/URL.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><span class="lines">@@ -97,13 +98,11 @@
</span><span class="cx">     const URL& httpsProxy() const { return m_httpsProxy; }
</span><span class="cx">     void setHTTPSProxy(URL&& proxy) { m_httpsProxy = WTFMove(proxy); }
</span><span class="cx"> 
</span><del>-    constexpr static uint64_t defaultPerOriginStorageQuota = 50 * 1024 * 1024;
-
</del><span class="cx"> private:
</span><span class="cx">     WebsiteDataStoreConfiguration();
</span><span class="cx"> 
</span><span class="cx">     String m_cacheStorageDirectory;
</span><del>-    uint64_t m_perOriginStorageQuota { defaultPerOriginStorageQuota };
</del><ins>+    uint64_t m_perOriginStorageQuota { WebCore::StorageQuotaManager::defaultQuota() };
</ins><span class="cx">     String m_networkCacheDirectory;
</span><span class="cx">     String m_applicationCacheDirectory;
</span><span class="cx">     String m_applicationCacheFlatFileSubdirectoryName;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245697 => 245698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-23 18:07:49 UTC (rev 245697)
+++ trunk/Tools/ChangeLog       2019-05-23 18:08:01 UTC (rev 245698)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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):
+
</ins><span class="cx"> 2019-05-23  Keith Rollin  <krollin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         generate-xcfilelists should not store temporary build files in /tmp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaStorageQuotamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm (245697 => 245698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm      2019-05-23 18:07:49 UTC (rev 245697)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm 2019-05-23 18:08:01 UTC (rev 245698)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "Test.h"
</span><ins>+#import "TestNavigationDelegate.h"
</ins><span class="cx"> #import "TestWKWebView.h"
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="cx"> #import <WebKit/WKProcessPoolPrivate.h>
</span><span class="lines">@@ -41,11 +42,14 @@
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><ins>+#include <wtf/text/StringConcatenateNumbers.h>
</ins><span class="cx"> #import <wtf/text/StringHash.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><span class="cx"> using namespace TestWebKitAPI;
</span><span class="cx"> 
</span><ins>+static bool didFinishNavigation;
+
</ins><span class="cx"> @interface QuotaDelegate : NSObject <WKUIDelegate>
</span><span class="cx"> -(bool)quotaDelegateCalled;
</span><span class="cx"> -(void)grantQuota;
</span><span class="lines">@@ -182,6 +186,31 @@
</span><span class="cx"> </script>
</span><span class="cx"> )SWRESOURCE";
</span><span class="cx"> 
</span><ins>+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";
+
</ins><span class="cx"> static bool done;
</span><span class="cx"> 
</span><span class="cx"> static inline void setVisible(TestWKWebView *webView)
</span><span class="lines">@@ -349,3 +378,48 @@
</span><span class="cx"> 
</span><span class="cx">     EXPECT_FALSE(receivedQuotaDelegateCalled);
</span><span class="cx"> }
</span><ins>+
+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);
+}
</ins></span></pre>
</div>
</div>

</body>
</html>