<!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>[178567] 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/178567">178567</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 18:07:08 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a connection parameter to StorageManager willOpen/didClose functions
https://bugs.webkit.org/show_bug.cgi?id=140527
Reviewed by Tim Horton.
Rename processWillCloseConnection to processDidCloseConnection and pass connections
to both functions since in the near future we won't be able to get the connection from
the web process proxy in these scenarios.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::processWillOpenConnection):
(WebKit::StorageManager::processDidCloseConnection):
(WebKit::StorageManager::processWillCloseConnection): Deleted.
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::webProcessWillOpenConnection):
(WebKit::WebsiteDataStore::webProcessDidCloseConnection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178566 => 178567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-16 02:01:17 UTC (rev 178566)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 02:07:08 UTC (rev 178567)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-15 Anders Carlsson <andersca@apple.com>
+
+ Add a connection parameter to StorageManager willOpen/didClose functions
+ https://bugs.webkit.org/show_bug.cgi?id=140527
+
+ Reviewed by Tim Horton.
+
+ Rename processWillCloseConnection to processDidCloseConnection and pass connections
+ to both functions since in the near future we won't be able to get the connection from
+ the web process proxy in these scenarios.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::processWillOpenConnection):
+ (WebKit::StorageManager::processDidCloseConnection):
+ (WebKit::StorageManager::processWillCloseConnection): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::webProcessWillOpenConnection):
+ (WebKit::WebsiteDataStore::webProcessDidCloseConnection):
+
</ins><span class="cx"> 2015-01-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Wire diagnostic logging messages through the UIProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (178566 => 178567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-16 02:01:17 UTC (rev 178566)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-16 02:07:08 UTC (rev 178567)
</span><span class="lines">@@ -485,23 +485,24 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::processWillOpenConnection(WebProcessProxy* webProcessProxy)
</del><ins>+void StorageManager::processWillOpenConnection(WebProcessProxy& webProcessProxy, IPC::Connection& connection)
</ins><span class="cx"> {
</span><del>- webProcessProxy->connection()->addWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName(), m_queue.get(), this);
</del><ins>+ connection.addWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName(), m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::processWillCloseConnection(WebProcessProxy* webProcessProxy)
</del><ins>+void StorageManager::processDidCloseConnection(WebProcessProxy& webProcessProxy, IPC::Connection& connection)
</ins><span class="cx"> {
</span><del>- webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
</del><ins>+ connection.removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
</ins><span class="cx">
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><del>- RefPtr<IPC::Connection> connection(webProcessProxy->connection());
</del><ins>+ RefPtr<IPC::Connection> protectedConnection(&connection);
</ins><span class="cx">
</span><del>- m_queue->dispatch([storageManager, connection] {
</del><ins>+ m_queue->dispatch([storageManager, protectedConnection] {
</ins><span class="cx"> Vector<std::pair<RefPtr<IPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
</span><span class="cx"> auto storageAreasByConnection = storageManager->m_storageAreasByConnection;
</span><del>- for (HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>>::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
- if (it->key.first != connection)
</del><ins>+
+ for (auto it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
+ if (it->key.first != protectedConnection)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> it->value->removeListener(*it->key.first, it->key.second);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (178566 => 178567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-16 02:01:17 UTC (rev 178566)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-16 02:07:08 UTC (rev 178567)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> void setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, IPC::Connection* allowedConnection);
</span><span class="cx"> void cloneSessionStorageNamespace(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID);
</span><span class="cx">
</span><del>- void processWillOpenConnection(WebProcessProxy*);
- void processWillCloseConnection(WebProcessProxy*);
</del><ins>+ void processWillOpenConnection(WebProcessProxy&, IPC::Connection&);
+ void processDidCloseConnection(WebProcessProxy&, IPC::Connection&);
</ins><span class="cx"> void applicationWillTerminate();
</span><span class="cx">
</span><span class="cx"> void getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (178566 => 178567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-01-16 02:01:17 UTC (rev 178566)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-01-16 02:07:08 UTC (rev 178567)
</span><span class="lines">@@ -197,10 +197,10 @@
</span><span class="cx"> m_storageManager->destroySessionStorageNamespace(webPageProxy.pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::webProcessWillOpenConnection(WebProcessProxy& webProcessProxy, IPC::Connection&)
</del><ins>+void WebsiteDataStore::webProcessWillOpenConnection(WebProcessProxy& webProcessProxy, IPC::Connection& connection)
</ins><span class="cx"> {
</span><span class="cx"> if (m_storageManager)
</span><del>- m_storageManager->processWillOpenConnection(&webProcessProxy);
</del><ins>+ m_storageManager->processWillOpenConnection(webProcessProxy, connection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebsiteDataStore::webPageWillOpenConnection(WebPageProxy& webPageProxy, IPC::Connection& connection)
</span><span class="lines">@@ -215,10 +215,10 @@
</span><span class="cx"> m_storageManager->setAllowedSessionStorageNamespaceConnection(webPageProxy.pageID(), nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::webProcessDidCloseConnection(WebProcessProxy& webProcessProxy, IPC::Connection&)
</del><ins>+void WebsiteDataStore::webProcessDidCloseConnection(WebProcessProxy& webProcessProxy, IPC::Connection& connection)
</ins><span class="cx"> {
</span><span class="cx"> if (m_storageManager)
</span><del>- m_storageManager->processWillCloseConnection(&webProcessProxy);
</del><ins>+ m_storageManager->processDidCloseConnection(webProcessProxy, connection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>