<!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>[178511] 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/178511">178511</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 08:45:12 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't pass an allowed connection when creating a session storage namespace
https://bugs.webkit.org/show_bug.cgi?id=140482
Reviewed by Sam Weinig.
Instead, always call setAllowedSessionStorageNamespaceConnection. This will make it easier to
move the storage manager into WebsiteDataStore and make it use the process lifetime observer machinery.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::SessionStorageNamespace::create):
(WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
(WebKit::StorageManager::createSessionStorageNamespace):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178510 => 178511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-15 14:19:56 UTC (rev 178510)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-15 16:45:12 UTC (rev 178511)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-14 Anders Carlsson <andersca@apple.com>
+
+ Don't pass an allowed connection when creating a session storage namespace
+ https://bugs.webkit.org/show_bug.cgi?id=140482
+
+ Reviewed by Sam Weinig.
+
+ Instead, always call setAllowedSessionStorageNamespaceConnection. This will make it easier to
+ move the storage manager into WebsiteDataStore and make it use the process lifetime observer machinery.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::SessionStorageNamespace::create):
+ (WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
+ (WebKit::StorageManager::createSessionStorageNamespace):
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+
</ins><span class="cx"> 2015-01-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r177075): [GTK] Creating a second web view disables accelerated compositing in existing web view
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (178510 => 178511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-15 14:19:56 UTC (rev 178510)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-01-15 16:45:12 UTC (rev 178511)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::SessionStorageNamespace : public ThreadSafeRefCounted<SessionStorageNamespace> {
</span><span class="cx"> public:
</span><del>- static Ref<SessionStorageNamespace> create(IPC::Connection* allowedConnection, unsigned quotaInBytes);
</del><ins>+ static Ref<SessionStorageNamespace> create(unsigned quotaInBytes);
</ins><span class="cx"> ~SessionStorageNamespace();
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const { return m_storageAreaMap.isEmpty(); }
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SessionStorageNamespace(IPC::Connection* allowedConnection, unsigned quotaInBytes);
</del><ins>+ explicit SessionStorageNamespace(unsigned quotaInBytes);
</ins><span class="cx">
</span><span class="cx"> RefPtr<IPC::Connection> m_allowedConnection;
</span><span class="cx"> unsigned m_quotaInBytes;
</span><span class="lines">@@ -377,14 +377,13 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Ref<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(IPC::Connection* allowedConnection, unsigned quotaInBytes)
</del><ins>+Ref<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(unsigned quotaInBytes)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new SessionStorageNamespace(allowedConnection, quotaInBytes));
</del><ins>+ return adoptRef(*new SessionStorageNamespace(quotaInBytes));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StorageManager::SessionStorageNamespace::SessionStorageNamespace(IPC::Connection* allowedConnection, unsigned quotaInBytes)
- : m_allowedConnection(allowedConnection)
- , m_quotaInBytes(quotaInBytes)
</del><ins>+StorageManager::SessionStorageNamespace::SessionStorageNamespace(unsigned quotaInBytes)
+ : m_quotaInBytes(quotaInBytes)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -433,15 +432,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes)
</del><ins>+void StorageManager::createSessionStorageNamespace(uint64_t storageNamespaceID, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><del>- RefPtr<IPC::Connection> connection(allowedConnection);
</del><span class="cx">
</span><del>- m_queue->dispatch([storageManager, connection, storageNamespaceID, quotaInBytes] {
</del><ins>+ m_queue->dispatch([storageManager, storageNamespaceID, quotaInBytes] {
</ins><span class="cx"> ASSERT(!storageManager->m_sessionStorageNamespaces.contains(storageNamespaceID));
</span><span class="cx">
</span><del>- storageManager->m_sessionStorageNamespaces.set(storageNamespaceID, SessionStorageNamespace::create(connection.get(), quotaInBytes));
</del><ins>+ storageManager->m_sessionStorageNamespaces.set(storageNamespaceID, SessionStorageNamespace::create(quotaInBytes));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (178510 => 178511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-15 14:19:56 UTC (rev 178510)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-01-15 16:45:12 UTC (rev 178511)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> static Ref<StorageManager> create(const String& localStorageDirectory);
</span><span class="cx"> ~StorageManager();
</span><span class="cx">
</span><del>- void createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes);
</del><ins>+ void createSessionStorageNamespace(uint64_t storageNamespaceID, unsigned quotaInBytes);
</ins><span class="cx"> void destroySessionStorageNamespace(uint64_t storageNamespaceID);
</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></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178510 => 178511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-15 14:19:56 UTC (rev 178510)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-15 16:45:12 UTC (rev 178511)
</span><span class="lines">@@ -380,12 +380,15 @@
</span><span class="cx"> , m_viewStateChangeWantsSynchronousReply(false)
</span><span class="cx"> , m_isPlayingAudio(false)
</span><span class="cx"> {
</span><ins>+ m_process->processPool().storageManager().createSessionStorageNamespace(m_pageID, std::numeric_limits<unsigned>::max());
+
</ins><span class="cx"> m_webProcessLifetimeTracker.addObserver(m_visitedLinkProvider);
</span><span class="cx"> m_webProcessLifetimeTracker.addObserver(m_websiteDataStore);
</span><span class="cx">
</span><span class="cx"> if (m_process->state() == WebProcessProxy::State::Running) {
</span><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_process->addWebUserContentControllerProxy(*m_userContentController);
</span><ins>+ m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, m_process->connection());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateViewState();
</span><span class="lines">@@ -422,9 +425,6 @@
</span><span class="cx">
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
</span><span class="cx">
</span><del>- // FIXME: If we ever expose the session storage size as a preference, we need to pass it here.
- IPC::Connection* connection = m_process->state() == WebProcessProxy::State::Running ? m_process->connection() : nullptr;
- m_process->processPool().storageManager().createSessionStorageNamespace(m_pageID, connection, std::numeric_limits<unsigned>::max());
</del><span class="cx"> setSessionID(configuration.sessionID);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>