<!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>[177920] 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/177920">177920</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 11:00:49 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change more connection pointers to references
https://bugs.webkit.org/show_bug.cgi?id=140085
Reviewed by Andreas Kling.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::addListener):
(WebKit::StorageManager::StorageArea::removeListener):
(WebKit::StorageManager::createLocalStorageMap):
(WebKit::StorageManager::createTransientLocalStorageMap):
(WebKit::StorageManager::createSessionStorageMap):
(WebKit::StorageManager::destroyStorageMap):
(WebKit::StorageManager::getValues):
(WebKit::StorageManager::setItem):
(WebKit::StorageManager::removeItem):
(WebKit::StorageManager::clear):
(WebKit::StorageManager::applicationWillTerminate):
(WebKit::StorageManager::invalidateConnectionInternal):
(WebKit::StorageManager::findStorageArea):
* UIProcess/Storage/StorageManager.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177919 => 177920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-05 18:50:24 UTC (rev 177919)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-05 19:00:49 UTC (rev 177920)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-01-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Change more connection pointers to references
+ https://bugs.webkit.org/show_bug.cgi?id=140085
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::addListener):
+ (WebKit::StorageManager::StorageArea::removeListener):
+ (WebKit::StorageManager::createLocalStorageMap):
+ (WebKit::StorageManager::createTransientLocalStorageMap):
+ (WebKit::StorageManager::createSessionStorageMap):
+ (WebKit::StorageManager::destroyStorageMap):
+ (WebKit::StorageManager::getValues):
+ (WebKit::StorageManager::setItem):
+ (WebKit::StorageManager::removeItem):
+ (WebKit::StorageManager::clear):
+ (WebKit::StorageManager::applicationWillTerminate):
+ (WebKit::StorageManager::invalidateConnectionInternal):
+ (WebKit::StorageManager::findStorageArea):
+ * UIProcess/Storage/StorageManager.h:
+
+2015-01-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Change more of the IPC code to take connections by reference
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140083
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177919 => 177920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-05 18:50:24 UTC (rev 177919)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-05 19:00:49 UTC (rev 177920)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
</span><span class="cx">
</span><del>- void addListener(IPC::Connection*, uint64_t storageMapID);
- void removeListener(IPC::Connection*, uint64_t storageMapID);
</del><ins>+ void addListener(IPC::Connection&, uint64_t storageMapID);
+ void removeListener(IPC::Connection&, uint64_t storageMapID);
</ins><span class="cx">
</span><span class="cx"> Ref<StorageArea> clone() const;
</span><span class="cx">
</span><span class="lines">@@ -178,16 +178,16 @@
</span><span class="cx"> m_localStorageNamespace->didDestroyStorageArea(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::StorageArea::addListener(IPC::Connection* connection, uint64_t storageMapID)
</del><ins>+void StorageManager::StorageArea::addListener(IPC::Connection& connection, uint64_t storageMapID)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_eventListeners.contains(std::make_pair(connection, storageMapID)));
- m_eventListeners.add(std::make_pair(connection, storageMapID));
</del><ins>+ ASSERT(!m_eventListeners.contains(std::make_pair(&connection, storageMapID)));
+ m_eventListeners.add(std::make_pair(&connection, storageMapID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::StorageArea::removeListener(IPC::Connection* connection, uint64_t storageMapID)
</del><ins>+void StorageManager::StorageArea::removeListener(IPC::Connection& connection, uint64_t storageMapID)
</ins><span class="cx"> {
</span><del>- ASSERT(m_eventListeners.contains(std::make_pair(connection, storageMapID)));
- m_eventListeners.remove(std::make_pair(connection, storageMapID));
</del><ins>+ ASSERT(m_eventListeners.contains(std::make_pair(&connection, storageMapID)));
+ m_eventListeners.remove(std::make_pair(&connection, storageMapID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<StorageManager::StorageArea> StorageManager::StorageArea::clone() const
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> ASSERT(localStorageNamespace);
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageArea> storageArea = localStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
</span><del>- storageArea->addListener(&connection, storageMapID);
</del><ins>+ storageArea->addListener(connection, storageMapID);
</ins><span class="cx">
</span><span class="cx"> result.iterator->value = storageArea.release();
</span><span class="cx"> }
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> TransientLocalStorageNamespace* transientLocalStorageNamespace = getOrCreateTransientLocalStorageNamespace(storageNamespaceID, *topLevelOriginData.securityOrigin());
</span><span class="cx">
</span><span class="cx"> auto storageArea = transientLocalStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
</span><del>- storageArea->addListener(&connection, storageMapID);
</del><ins>+ storageArea->addListener(connection, storageMapID);
</ins><span class="cx">
</span><span class="cx"> slot = WTF::move(storageArea);
</span><span class="cx"> }
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> ASSERT(&connection == sessionStorageNamespace->allowedConnection());
</span><span class="cx">
</span><span class="cx"> auto storageArea = sessionStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
</span><del>- storageArea->addListener(&connection, storageMapID);
</del><ins>+ storageArea->addListener(connection, storageMapID);
</ins><span class="cx">
</span><span class="cx"> slot = WTF::move(storageArea);
</span><span class="cx"> }
</span><span class="lines">@@ -625,13 +625,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- it->value->removeListener(&connection, storageMapID);
</del><ins>+ it->value->removeListener(connection, storageMapID);
</ins><span class="cx"> m_storageAreasByConnection.remove(connectionAndStorageMapIDPair);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::getValues(IPC::Connection& connection, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values)
</span><span class="cx"> {
</span><del>- StorageArea* storageArea = findStorageArea(&connection, storageMapID);
</del><ins>+ StorageArea* storageArea = findStorageArea(connection, storageMapID);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> // This is a session storage area for a page that has already been closed. Ignore it.
</span><span class="cx"> return;
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::setItem(IPC::Connection& connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString)
</span><span class="cx"> {
</span><del>- StorageArea* storageArea = findStorageArea(&connection, storageMapID);
</del><ins>+ StorageArea* storageArea = findStorageArea(connection, storageMapID);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> // This is a session storage area for a page that has already been closed. Ignore it.
</span><span class="cx"> return;
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::removeItem(IPC::Connection& connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString)
</span><span class="cx"> {
</span><del>- StorageArea* storageArea = findStorageArea(&connection, storageMapID);
</del><ins>+ StorageArea* storageArea = findStorageArea(connection, storageMapID);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> // This is a session storage area for a page that has already been closed. Ignore it.
</span><span class="cx"> return;
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::clear(IPC::Connection& connection, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString)
</span><span class="cx"> {
</span><del>- StorageArea* storageArea = findStorageArea(&connection, storageMapID);
</del><ins>+ StorageArea* storageArea = findStorageArea(connection, storageMapID);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> // This is a session storage area for a page that has already been closed. Ignore it.
</span><span class="cx"> return;
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx"> m_queue->dispatch([this, &semaphore] {
</span><span class="cx"> Vector<std::pair<RefPtr<IPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
</span><span class="cx"> for (auto& connectionStorageAreaPair : m_storageAreasByConnection) {
</span><del>- connectionStorageAreaPair.value->removeListener(connectionStorageAreaPair.key.first.get(), connectionStorageAreaPair.key.second);
</del><ins>+ connectionStorageAreaPair.value->removeListener(*connectionStorageAreaPair.key.first, connectionStorageAreaPair.key.second);
</ins><span class="cx"> connectionAndStorageMapIDPairsToRemove.append(connectionStorageAreaPair.key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> if (it->key.first != connection)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- it->value->removeListener(it->key.first.get(), it->key.second);
</del><ins>+ it->value->removeListener(*it->key.first, it->key.second);
</ins><span class="cx"> connectionAndStorageMapIDPairsToRemove.append(it->key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -748,9 +748,9 @@
</span><span class="cx"> m_storageAreasByConnection.remove(connectionAndStorageMapIDPairsToRemove[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageManager::StorageArea* StorageManager::findStorageArea(IPC::Connection* connection, uint64_t storageMapID) const
</del><ins>+StorageManager::StorageArea* StorageManager::findStorageArea(IPC::Connection& connection, uint64_t storageMapID) const
</ins><span class="cx"> {
</span><del>- std::pair<IPC::Connection*, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
</del><ins>+ std::pair<IPC::Connection*, uint64_t> connectionAndStorageMapIDPair(&connection, storageMapID);
</ins><span class="cx">
</span><span class="cx"> if (!m_storageAreasByConnection.isValidKey(connectionAndStorageMapIDPair))
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (177919 => 177920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-05 18:50:24 UTC (rev 177919)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-05 19:00:49 UTC (rev 177920)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> void invalidateConnectionInternal(IPC::Connection*);
</span><span class="cx">
</span><span class="cx"> class StorageArea;
</span><del>- StorageArea* findStorageArea(IPC::Connection*, uint64_t) const;
</del><ins>+ StorageArea* findStorageArea(IPC::Connection&, uint64_t) const;
</ins><span class="cx">
</span><span class="cx"> class LocalStorageNamespace;
</span><span class="cx"> LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
</span></span></pre>
</div>
</div>
</body>
</html>