<!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>[212766] trunk/Source/WebKit2</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/212766">212766</a></dd>
<dt>Author</dt> <dd>wilander@apple.com</dd>
<dt>Date</dt> <dd>2017-02-21 14:55:27 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Resource Load Statistics: Only scan website data store once per session ID + reinstate removal counting
https://bugs.webkit.org/show_bug.cgi?id=168541
Reviewed by Alex Christensen.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores):
The CallbackAggregator now merges a list of domains for which we
have removed data records and eventually reports this back to the
caller.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
Now reports back to its WebCore::ResourceLoadStatisticsStore
which domains have had data records removed.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchDataForTopPrivatelyOwnedDomains):
The completion handler now handles data record removal counting.
(WebKit::WebsiteDataStore::removeDataForTopPrivatelyOwnedDomains):
The completion handler now handles data record removal counting.
* UIProcess/WebsiteData/WebsiteDataStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp">trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2017-02-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><ins>+ Resource Load Statistics: Only scan website data store once per session ID + reinstate removal counting
+ https://bugs.webkit.org/show_bug.cgi?id=168541
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores):
+ The CallbackAggregator now merges a list of domains for which we
+ have removed data records and eventually reports this back to the
+ caller.
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::removeDataRecords):
+ Now reports back to its WebCore::ResourceLoadStatisticsStore
+ which domains have had data records removed.
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchDataForTopPrivatelyOwnedDomains):
+ The completion handler now handles data record removal counting.
+ (WebKit::WebsiteDataStore::removeDataForTopPrivatelyOwnedDomains):
+ The completion handler now handles data record removal counting.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
+2017-02-21 John Wilander <wilander@apple.com>
+
</ins><span class="cx"> Resource Load Statistics: Add alternate classification method
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168347
</span><span class="cx"> <rdar://problem/30352793>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -203,13 +203,17 @@
</span><span class="cx"> return globalPageMap().get(pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>& topPrivatelyOwnedDomains, bool shouldNotifyPage, std::function<void()> completionHandler)
</del><ins>+void WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType> dataTypes, Vector<String>& topPrivatelyOwnedDomains, bool shouldNotifyPage, std::function<void(Vector<String>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
</span><del>- explicit CallbackAggregator(std::function<void()> completionHandler)
</del><ins>+ explicit CallbackAggregator(std::function<void(Vector<String>)> completionHandler)
</ins><span class="cx"> : completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+ void addDomainsWithDeletedWebsiteData(const Vector<String>& domains)
+ {
+ domainsWithDeletedWebsiteData.appendVector(domains);
+ }
</ins><span class="cx">
</span><span class="cx"> void addPendingCallback()
</span><span class="cx"> {
</span><span class="lines">@@ -227,23 +231,28 @@
</span><span class="cx"> void callIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> if (!pendingCallbacks)
</span><del>- completionHandler();
</del><ins>+ completionHandler(domainsWithDeletedWebsiteData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned pendingCallbacks = 0;
</span><del>- std::function<void()> completionHandler;
</del><ins>+ std::function<void(Vector<String>)> completionHandler;
+ Vector<String> domainsWithDeletedWebsiteData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</span><span class="cx">
</span><ins>+ HashSet<WebCore::SessionID> visitedSessionIDs;
</ins><span class="cx"> for (auto& page : globalPageMap()) {
</span><del>- if (!page.value->websiteDataStore().isPersistent())
</del><ins>+ auto& dataStore = page.value->websiteDataStore();
+ if (!dataStore.isPersistent() || visitedSessionIDs.contains(dataStore.sessionID()))
</ins><span class="cx"> continue;
</span><ins>+ visitedSessionIDs.add(dataStore.sessionID());
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- page.value->websiteDataStore().removeDataForTopPrivatelyOwnedDomains(dataTypes, { }, topPrivatelyOwnedDomains, [callbackAggregator, shouldNotifyPage, page]() {
</del><ins>+ dataStore.removeDataForTopPrivatelyOwnedDomains(dataTypes, { }, topPrivatelyOwnedDomains, [callbackAggregator, shouldNotifyPage, page](auto domainsWithDeletedWebsiteData) {
</ins><span class="cx"> if (shouldNotifyPage)
</span><span class="cx"> page.value->postMessageToInjectedBundle("WebsiteDataDeletionForTopPrivatelyOwnedDomainsFinished", nullptr);
</span><del>- WTF::RunLoop::main().dispatch([callbackAggregator] {
</del><ins>+ WTF::RunLoop::main().dispatch([callbackAggregator, domainsWithDeletedWebsiteData] {
+ callbackAggregator->addDomainsWithDeletedWebsiteData(domainsWithDeletedWebsiteData);
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, Function<void(WebsiteData)> completionHandler);
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, Function<void()> completionHandler);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, Function<void()> completionHandler);
</span><del>- static void deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>& topPrivatelyOwnedDomains, bool shouldNotifyPages, std::function<void()> completionHandler);
</del><ins>+ static void deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(OptionSet<WebsiteDataType>, Vector<String>& topPrivatelyOwnedDomains, bool shouldNotifyPages, std::function<void(Vector<String>)> completionHandler);
</ins><span class="cx">
</span><span class="cx"> void enableSuddenTermination();
</span><span class="cx"> void disableSuddenTermination();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -128,7 +128,8 @@
</span><span class="cx">
</span><span class="cx"> // Switch to the main thread to get the default website data store
</span><span class="cx"> RunLoop::main().dispatch([prevalentResourceDomains = WTFMove(prevalentResourceDomains), this] () mutable {
</span><del>- WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(dataTypesToRemove, prevalentResourceDomains, notifyPages, [this]() mutable {
</del><ins>+ WebProcessProxy::deleteWebsiteDataForTopPrivatelyOwnedDomainsInAllPersistentDataStores(dataTypesToRemove, prevalentResourceDomains, notifyPages, [this](Vector<String> domainsWithDeletedWebsiteData) mutable {
+ this->coreStore().updateStatisticsForRemovedDataRecords(domainsWithDeletedWebsiteData);
</ins><span class="cx"> m_dataRecordsRemovalPending = false;
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::fetchDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<WebsiteDataRecord>)> completionHandler)
</del><ins>+void WebsiteDataStore::fetchDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<WebsiteDataRecord>&&, Vector<String>&&)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> fetchData(dataTypes, fetchOptions, [topPrivatelyOwnedDomains, completionHandler, this](auto existingDataRecords) {
</span><span class="cx"> Vector<WebsiteDataRecord> matchingDataRecords;
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- completionHandler(matchingDataRecords);
</del><ins>+ completionHandler(WTFMove(matchingDataRecords), WTFMove(domainsWithDataRecords));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1027,11 +1027,11 @@
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::removeDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, const Vector<String>& topPrivatelyOwnedDomains, std::function<void()> completionHandler)
</del><ins>+void WebsiteDataStore::removeDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<String>)> completionHandler)
</ins><span class="cx"> {
</span><del>- fetchDataForTopPrivatelyOwnedDomains(dataTypes, fetchOptions, topPrivatelyOwnedDomains, [dataTypes, completionHandler, this](auto websiteDataRecords) {
- this->removeData(dataTypes, websiteDataRecords, [completionHandler]() {
- completionHandler();
</del><ins>+ fetchDataForTopPrivatelyOwnedDomains(dataTypes, fetchOptions, topPrivatelyOwnedDomains, [dataTypes, completionHandler, this](auto websiteDataRecords, auto domainsWithDataRecords) {
+ this->removeData(dataTypes, websiteDataRecords, [domainsWithDataRecords, completionHandler]() {
+ completionHandler(domainsWithDataRecords);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (212765 => 212766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2017-02-21 22:54:17 UTC (rev 212765)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2017-02-21 22:55:27 UTC (rev 212766)
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx"> static void cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage);
</span><span class="cx">
</span><span class="cx"> void fetchData(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
</span><del>- void fetchDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<WebsiteDataRecord>)> completionHandler);
</del><ins>+ void fetchDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<WebsiteDataRecord>&&, Vector<String>&&)> completionHandler);
</ins><span class="cx"> void removeData(OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><span class="cx"> void removeData(OptionSet<WebsiteDataType>, const Vector<WebsiteDataRecord>&, std::function<void ()> completionHandler);
</span><del>- void removeDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyOwnedDomains, std::function<void()> completionHandler);
</del><ins>+ void removeDataForTopPrivatelyOwnedDomains(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, const Vector<String>& topPrivatelyOwnedDomains, std::function<void(Vector<String>)> completionHandler);
</ins><span class="cx">
</span><span class="cx"> StorageManager* storageManager() { return m_storageManager.get(); }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>