<!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>[177921] 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/177921">177921</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 12:07:20 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the storage manager some more
https://bugs.webkit.org/show_bug.cgi?id=140086
Reviewed by Andreas Kling.
Use lambdas instead of WTF::bind and get rid of a couple of internal functions.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::createSessionStorageNamespace):
(WebKit::StorageManager::destroySessionStorageNamespace):
(WebKit::StorageManager::setAllowedSessionStorageNamespaceConnection):
(WebKit::StorageManager::cloneSessionStorageNamespace):
(WebKit::StorageManager::processWillCloseConnection):
(WebKit::StorageManager::createSessionStorageNamespaceInternal): Deleted.
(WebKit::StorageManager::destroySessionStorageNamespaceInternal): Deleted.
(WebKit::StorageManager::setAllowedSessionStorageNamespaceConnectionInternal): Deleted.
(WebKit::StorageManager::cloneSessionStorageNamespaceInternal): Deleted.
(WebKit::StorageManager::invalidateConnectionInternal): Deleted.
* 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 (177920 => 177921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-05 19:00:49 UTC (rev 177920)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-05 20:07:20 UTC (rev 177921)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Clean up the storage manager some more
+ https://bugs.webkit.org/show_bug.cgi?id=140086
+
+ Reviewed by Andreas Kling.
+
+ Use lambdas instead of WTF::bind and get rid of a couple of internal functions.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::createSessionStorageNamespace):
+ (WebKit::StorageManager::destroySessionStorageNamespace):
+ (WebKit::StorageManager::setAllowedSessionStorageNamespaceConnection):
+ (WebKit::StorageManager::cloneSessionStorageNamespace):
+ (WebKit::StorageManager::processWillCloseConnection):
+ (WebKit::StorageManager::createSessionStorageNamespaceInternal): Deleted.
+ (WebKit::StorageManager::destroySessionStorageNamespaceInternal): Deleted.
+ (WebKit::StorageManager::setAllowedSessionStorageNamespaceConnectionInternal): Deleted.
+ (WebKit::StorageManager::cloneSessionStorageNamespaceInternal): Deleted.
+ (WebKit::StorageManager::invalidateConnectionInternal): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+
+2015-01-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Change more connection pointers to references
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140085
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177920 => 177921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-05 19:00:49 UTC (rev 177920)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-05 20:07:20 UTC (rev 177921)
</span><span class="lines">@@ -435,22 +435,56 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes)
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::createSessionStorageNamespaceInternal, this, storageNamespaceID, RefPtr<IPC::Connection>(allowedConnection), quotaInBytes));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+ RefPtr<IPC::Connection> connection(allowedConnection);
+
+ m_queue->dispatch([storageManager, connection, storageNamespaceID, quotaInBytes] {
+ ASSERT(!storageManager->m_sessionStorageNamespaces.contains(storageNamespaceID));
+
+ storageManager->m_sessionStorageNamespaces.set(storageNamespaceID, SessionStorageNamespace::create(connection.get(), quotaInBytes));
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::destroySessionStorageNamespace(uint64_t storageNamespaceID)
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::destroySessionStorageNamespaceInternal, this, storageNamespaceID));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, storageNamespaceID] {
+ ASSERT(storageManager->m_sessionStorageNamespaces.contains(storageNamespaceID));
+ storageManager->m_sessionStorageNamespaces.remove(storageNamespaceID);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::setAllowedSessionStorageNamespaceConnection(uint64_t storageNamespaceID, IPC::Connection* allowedConnection)
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::setAllowedSessionStorageNamespaceConnectionInternal, this, storageNamespaceID, RefPtr<IPC::Connection>(allowedConnection)));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+ RefPtr<IPC::Connection> connection(allowedConnection);
+
+ m_queue->dispatch([storageManager, connection, storageNamespaceID] {
+ ASSERT(storageManager->m_sessionStorageNamespaces.contains(storageNamespaceID));
+
+ storageManager->m_sessionStorageNamespaces.get(storageNamespaceID)->setAllowedConnection(connection.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::cloneSessionStorageNamespace(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID)
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::cloneSessionStorageNamespaceInternal, this, storageNamespaceID, newStorageNamespaceID));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, storageNamespaceID, newStorageNamespaceID] {
+ SessionStorageNamespace* sessionStorageNamespace = storageManager->m_sessionStorageNamespaces.get(storageNamespaceID);
+ if (!sessionStorageNamespace) {
+ // FIXME: We can get into this situation if someone closes the originating page from within a
+ // createNewPage callback. We bail for now, but we should really find a way to keep the session storage alive
+ // so we we'll clone the session storage correctly.
+ return;
+ }
+
+ SessionStorageNamespace* newSessionStorageNamespace = storageManager->m_sessionStorageNamespaces.get(newStorageNamespaceID);
+ ASSERT(newSessionStorageNamespace);
+
+ sessionStorageNamespace->cloneTo(*newSessionStorageNamespace);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::processWillOpenConnection(WebProcessProxy* webProcessProxy)
</span><span class="lines">@@ -462,7 +496,23 @@
</span><span class="cx"> {
</span><span class="cx"> webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
</span><span class="cx">
</span><del>- m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<IPC::Connection>(webProcessProxy->connection())));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+ RefPtr<IPC::Connection> connection(webProcessProxy->connection());
+
+ m_queue->dispatch([storageManager, connection] {
+ Vector<std::pair<RefPtr<IPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
+ auto storageAreasByConnection = storageManager->m_storageAreasByConnection;
+ 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)
+ continue;
+
+ it->value->removeListener(*it->key.first, it->key.second);
+ connectionAndStorageMapIDPairsToRemove.append(it->key);
+ }
+
+ for (size_t i = 0; i < connectionAndStorageMapIDPairsToRemove.size(); ++i)
+ storageManager->m_storageAreasByConnection.remove(connectionAndStorageMapIDPairsToRemove[i]);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
</span><span class="lines">@@ -678,42 +728,6 @@
</span><span class="cx"> connection.send(Messages::StorageAreaMap::DidClear(storageMapSeed), storageMapID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes)
-{
- ASSERT(!m_sessionStorageNamespaces.contains(storageNamespaceID));
-
- m_sessionStorageNamespaces.set(storageNamespaceID, SessionStorageNamespace::create(allowedConnection, quotaInBytes));
-}
-
-void StorageManager::destroySessionStorageNamespaceInternal(uint64_t storageNamespaceID)
-{
- ASSERT(m_sessionStorageNamespaces.contains(storageNamespaceID));
- m_sessionStorageNamespaces.remove(storageNamespaceID);
-}
-
-void StorageManager::setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection)
-{
- ASSERT(m_sessionStorageNamespaces.contains(storageNamespaceID));
-
- m_sessionStorageNamespaces.get(storageNamespaceID)->setAllowedConnection(allowedConnection);
-}
-
-void StorageManager::cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID)
-{
- SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
- if (!sessionStorageNamespace) {
- // FIXME: We can get into this situation if someone closes the originating page from within a
- // createNewPage callback. We bail for now, but we should really find a way to keep the session storage alive
- // so we we'll clone the session storage correctly.
- return;
- }
-
- SessionStorageNamespace* newSessionStorageNamespace = m_sessionStorageNamespaces.get(newStorageNamespaceID);
- ASSERT(newSessionStorageNamespace);
-
- sessionStorageNamespace->cloneTo(*newSessionStorageNamespace);
-}
-
</del><span class="cx"> void StorageManager::applicationWillTerminate()
</span><span class="cx"> {
</span><span class="cx"> BinarySemaphore semaphore;
</span><span class="lines">@@ -732,22 +746,6 @@
</span><span class="cx"> semaphore.wait(std::numeric_limits<double>::max());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::invalidateConnectionInternal(IPC::Connection* connection)
-{
- Vector<std::pair<RefPtr<IPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
- HashMap<std::pair<RefPtr<IPC::Connection>, uint64_t>, RefPtr<StorageArea>> storageAreasByConnection = m_storageAreasByConnection;
- 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)
- continue;
-
- it->value->removeListener(*it->key.first, it->key.second);
- connectionAndStorageMapIDPairsToRemove.append(it->key);
- }
-
- for (size_t i = 0; i < connectionAndStorageMapIDPairsToRemove.size(); ++i)
- m_storageAreasByConnection.remove(connectionAndStorageMapIDPairsToRemove[i]);
-}
-
</del><span class="cx"> StorageManager::StorageArea* StorageManager::findStorageArea(IPC::Connection& connection, uint64_t storageMapID) const
</span><span class="cx"> {
</span><span class="cx"> std::pair<IPC::Connection*, uint64_t> connectionAndStorageMapIDPair(&connection, storageMapID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (177920 => 177921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-05 19:00:49 UTC (rev 177920)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-05 20:07:20 UTC (rev 177921)
</span><span class="lines">@@ -84,13 +84,6 @@
</span><span class="cx"> void removeItem(IPC::Connection&, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString);
</span><span class="cx"> void clear(IPC::Connection&, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString);
</span><span class="cx">
</span><del>- void createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes);
- void destroySessionStorageNamespaceInternal(uint64_t storageNamespaceID);
- void setAllowedSessionStorageNamespaceConnectionInternal(uint64_t storageNamespaceID, IPC::Connection* allowedConnection);
- void cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID);
-
- void invalidateConnectionInternal(IPC::Connection*);
-
</del><span class="cx"> class StorageArea;
</span><span class="cx"> StorageArea* findStorageArea(IPC::Connection&, uint64_t) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>