<!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>[184669] 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/184669">184669</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 16:04:15 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor process pool enumeration code in WebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=145218
Reviewed by Tim Horton.
Also make sure to keep the WebProcessPool objects alive for the duration of the various data store
operations. This is the first step towards having the data store create a single process pool lazily if
there are no web views associated with the data store.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
(WebKit::WebsiteDataStore::processPools):
* UIProcess/WebsiteData/WebsiteDataStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (184668 => 184669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-20 23:01:24 UTC (rev 184668)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-20 23:04:15 UTC (rev 184669)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-20 Anders Carlsson <andersca@apple.com>
+
+ Refactor process pool enumeration code in WebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=145218
+
+ Reviewed by Tim Horton.
+
+ Also make sure to keep the WebProcessPool objects alive for the duration of the various data store
+ operations. This is the first step towards having the data store create a single process pool lazily if
+ there are no web views associated with the data store.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+ (WebKit::WebsiteDataStore::processPools):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
</ins><span class="cx"> 2015-05-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Relax restrictions on triggers that match everything.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184668 => 184669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-20 23:01:24 UTC (rev 184668)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-20 23:04:15 UTC (rev 184669)
</span><span class="lines">@@ -215,11 +215,7 @@
</span><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> switch (networkProcessAccessType) {
</span><span class="cx"> case ProcessAccessType::OnlyIfLaunched:
</span><span class="cx"> if (!processPool->networkProcess())
</span><span class="lines">@@ -235,7 +231,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->networkProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator](WebsiteData websiteData) {
</del><ins>+ processPool->networkProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
</ins><span class="cx"> callbackAggregator->removePendingCallback(WTF::move(websiteData));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -335,15 +331,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->databaseProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator](WebsiteData websiteData) {
</del><ins>+ processPool->databaseProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
</ins><span class="cx"> callbackAggregator->removePendingCallback(WTF::move(websiteData));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -417,11 +409,7 @@
</span><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> switch (networkProcessAccessType) {
</span><span class="cx"> case ProcessAccessType::OnlyIfLaunched:
</span><span class="cx"> if (!processPool->networkProcess())
</span><span class="lines">@@ -437,7 +425,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->networkProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator] {
</del><ins>+ processPool->networkProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -516,15 +504,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->databaseProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator]() {
</del><ins>+ processPool->databaseProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -577,11 +561,7 @@
</span><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> switch (networkProcessAccessType) {
</span><span class="cx"> case ProcessAccessType::OnlyIfLaunched:
</span><span class="cx"> if (!processPool->networkProcess())
</span><span class="lines">@@ -603,7 +583,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->networkProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, cookieHostNames, [callbackAggregator] {
</del><ins>+ processPool->networkProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, cookieHostNames, [callbackAggregator, processPool] {
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -697,15 +677,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</span><del>- HashSet<WebProcessPool*> processPools;
- for (auto& process : processes())
- processPools.add(&process->processPool());
-
- for (auto& processPool : processPools) {
</del><ins>+ for (auto processPool : processPools()) {
</ins><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- processPool->databaseProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator]() {
</del><ins>+ processPool->databaseProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -752,4 +728,13 @@
</span><span class="cx"> m_storageManager->processDidCloseConnection(webProcessProxy, connection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HashSet<RefPtr<WebProcessPool>> WebsiteDataStore::processPools() const
+{
+ HashSet<RefPtr<WebProcessPool>> processPools;
+ for (auto& process : processes())
+ processPools.add(&process->processPool());
+
+ return processPools;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (184668 => 184669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-05-20 23:01:24 UTC (rev 184668)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-05-20 23:04:15 UTC (rev 184669)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager;
</span><span class="cx"> class WebPageProxy;
</span><ins>+class WebProcessPool;
</ins><span class="cx"> struct WebsiteDataRecord;
</span><span class="cx">
</span><span class="cx"> class WebsiteDataStore : public RefCounted<WebsiteDataStore>, public WebProcessLifetimeObserver {
</span><span class="lines">@@ -83,6 +84,8 @@
</span><span class="cx"> void platformInitialize();
</span><span class="cx"> void platformDestroy();
</span><span class="cx">
</span><ins>+ HashSet<RefPtr<WebProcessPool>> processPools() const;
+
</ins><span class="cx"> const uint64_t m_identifier;
</span><span class="cx"> const WebCore::SessionID m_sessionID;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>