<!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>[242947] trunk/Source</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/242947">242947</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-03-14 11:25:30 -0700 (Thu, 14 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reset storage quota when clearing IDB/Cache API entries
https://bugs.webkit.org/show_bug.cgi?id=195716

Reviewed by Chris Dumez.

Source/WebCore:

On clearing of databases, reset all quota users.
This will ensure all layout test runs start with a clean state.

* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::didPerformCloseAndDeleteDatabases):
* storage/StorageQuotaManager.h:
(WebCore::StorageQuotaManager::resetQuota):

Source/WebKit:

On clearing DOMCache or IDB data, reset quota value to the default value.
This ensures consistent layout test runs.

* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::deleteWebsiteData):
(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
(WebKit::NetworkProcess::clearStorageQuota):
* NetworkProcess/NetworkProcess.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageQuotaManagerh">trunk/Source/WebCore/storage/StorageQuotaManager.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcesscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessh">trunk/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebCore/ChangeLog      2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-03-14  Youenn Fablet  <youenn@apple.com>
+
+        Reset storage quota when clearing IDB/Cache API entries
+        https://bugs.webkit.org/show_bug.cgi?id=195716
+
+        Reviewed by Chris Dumez.
+
+        On clearing of databases, reset all quota users.
+        This will ensure all layout test runs start with a clean state.
+
+        * Modules/indexeddb/server/IDBServer.cpp:
+        (WebCore::IDBServer::IDBServer::didPerformCloseAndDeleteDatabases):
+        * storage/StorageQuotaManager.h:
+        (WebCore::StorageQuotaManager::resetQuota):
+
</ins><span class="cx"> 2019-03-14  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Certain videos are causing a crash when used as WebGL texture
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp      2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -648,6 +648,9 @@
</span><span class="cx"> 
</span><span class="cx"> void IDBServer::didPerformCloseAndDeleteDatabases(uint64_t callbackID)
</span><span class="cx"> {
</span><ins>+    for (auto& user : m_quotaUsers.values())
+        user->resetSpaceUsed();
+
</ins><span class="cx">     auto callback = m_deleteDatabaseCompletionHandlers.take(callbackID);
</span><span class="cx">     ASSERT(callback);
</span><span class="cx">     callback();
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageQuotaManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageQuotaManager.h (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageQuotaManager.h       2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebCore/storage/StorageQuotaManager.h  2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">     enum class Decision { Deny, Grant };
</span><span class="cx">     using RequestCallback = CompletionHandler<void(Decision)>;
</span><span class="cx">     WEBCORE_EXPORT void requestSpace(uint64_t, RequestCallback&&);
</span><ins>+    void resetQuota(uint64_t newQuota) { m_quota = newQuota; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     uint64_t spaceUsage() const;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebKit/ChangeLog       2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-14  Youenn Fablet  <youenn@apple.com>
+
+        Reset storage quota when clearing IDB/Cache API entries
+        https://bugs.webkit.org/show_bug.cgi?id=195716
+
+        Reviewed by Chris Dumez.
+
+        On clearing DOMCache or IDB data, reset quota value to the default value.
+        This ensures consistent layout test runs.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::deleteWebsiteData):
+        (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+        (WebKit::NetworkProcess::clearStorageQuota):
+        * NetworkProcess/NetworkProcess.h:
+
</ins><span class="cx"> 2019-03-13  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ContentChangeObserver] Stop content observation when content calls preventDefault() on touch events
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp    2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp       2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -1404,6 +1404,9 @@
</span><span class="cx"> 
</span><span class="cx">     if (websiteDataTypes.contains(WebsiteDataType::DiskCache) && !sessionID.isEphemeral())
</span><span class="cx">         clearDiskCache(modifiedSince, [clearTasksHandler = WTFMove(clearTasksHandler)] { });
</span><ins>+
+    if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases) || websiteDataTypes.contains(WebsiteDataType::DOMCache))
+        clearStorageQuota(sessionID);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void clearDiskCacheEntries(NetworkCache::Cache* cache, const Vector<SecurityOriginData>& origins, CompletionHandler<void()>&& completionHandler)
</span><span class="lines">@@ -1468,8 +1471,20 @@
</span><span class="cx"> 
</span><span class="cx">     if (websiteDataTypes.contains(WebsiteDataType::DiskCache) && !sessionID.isEphemeral())
</span><span class="cx">         clearDiskCacheEntries(cache(), originDatas, [clearTasksHandler = WTFMove(clearTasksHandler)] { });
</span><ins>+
+    // FIXME: Implement storage quota clearing for these origins.
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void NetworkProcess::clearStorageQuota(PAL::SessionID sessionID)
+{
+    auto iterator = m_storageQuotaManagers.find(sessionID);
+    if (iterator == m_storageQuotaManagers.end())
+        return;
+
+    for (auto& manager : iterator->value.managersPerOrigin.values())
+        manager->resetQuota(iterator->value.defaultQuota);
+}
+
</ins><span class="cx"> #if ENABLE(RESOURCE_LOAD_STATISTICS)
</span><span class="cx"> static Vector<String> filterForRegistrableDomains(const Vector<RegistrableDomain>& registrableDomains, const HashSet<String>& foundValues)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (242946 => 242947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h      2019-03-14 18:22:04 UTC (rev 242946)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-03-14 18:25:30 UTC (rev 242947)
</span><span class="lines">@@ -453,6 +453,8 @@
</span><span class="cx">     void performNextStorageTask();
</span><span class="cx">     void ensurePathExists(const String& path);
</span><span class="cx"> 
</span><ins>+    void clearStorageQuota(PAL::SessionID);
+
</ins><span class="cx">     // Connections to WebProcesses.
</span><span class="cx">     Vector<Ref<NetworkConnectionToWebProcess>> m_webProcessConnections;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>