<!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>[177392] 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/177392">177392</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 13:26:56 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Ref in StorageManager
https://bugs.webkit.org/show_bug.cgi?id=139698
Reviewed by Andreas Kling.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::TransientLocalStorageNamespace::create):
(WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
(WebKit::StorageManager::StorageArea::create):
(WebKit::StorageManager::StorageArea::clone):
(WebKit::StorageManager::LocalStorageNamespace::create):
(WebKit::StorageManager::SessionStorageNamespace::create):
(WebKit::StorageManager::create):
* 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 (177391 => 177392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-16 21:24:24 UTC (rev 177391)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-16 21:26:56 UTC (rev 177392)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-16 Anders Carlsson <andersca@apple.com>
+
+ Use Ref in StorageManager
+ https://bugs.webkit.org/show_bug.cgi?id=139698
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::TransientLocalStorageNamespace::create):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
+ (WebKit::StorageManager::StorageArea::create):
+ (WebKit::StorageManager::StorageArea::clone):
+ (WebKit::StorageManager::LocalStorageNamespace::create):
+ (WebKit::StorageManager::SessionStorageNamespace::create):
+ (WebKit::StorageManager::create):
+ * UIProcess/Storage/StorageManager.h:
+
</ins><span class="cx"> 2014-12-16 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Split UserActivity from disabled flag in WebPage
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177391 => 177392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-16 21:24:24 UTC (rev 177391)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-16 21:26:56 UTC (rev 177392)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::StorageArea : public ThreadSafeRefCounted<StorageManager::StorageArea> {
</span><span class="cx"> public:
</span><del>- static RefPtr<StorageArea> create(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
</del><ins>+ static Ref<StorageArea> create(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
</ins><span class="cx"> ~StorageArea();
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> void addListener(IPC::Connection*, uint64_t storageMapID);
</span><span class="cx"> void removeListener(IPC::Connection*, uint64_t storageMapID);
</span><span class="cx">
</span><del>- RefPtr<StorageArea> clone() const;
</del><ins>+ Ref<StorageArea> clone() const;
</ins><span class="cx">
</span><span class="cx"> void setItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& value, const String& urlString, bool& quotaException);
</span><span class="cx"> void removeItem(IPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& urlString);
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::LocalStorageNamespace : public ThreadSafeRefCounted<LocalStorageNamespace> {
</span><span class="cx"> public:
</span><del>- static RefPtr<LocalStorageNamespace> create(StorageManager*, uint64_t storageManagerID);
</del><ins>+ static Ref<LocalStorageNamespace> create(StorageManager*, uint64_t storageManagerID);
</ins><span class="cx"> ~LocalStorageNamespace();
</span><span class="cx">
</span><span class="cx"> StorageManager* storageManager() const { return m_storageManager; }
</span><span class="lines">@@ -108,23 +108,23 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::TransientLocalStorageNamespace : public ThreadSafeRefCounted<TransientLocalStorageNamespace> {
</span><span class="cx"> public:
</span><del>- static RefPtr<TransientLocalStorageNamespace> create()
</del><ins>+ static Ref<TransientLocalStorageNamespace> create()
</ins><span class="cx"> {
</span><del>- return adoptRef(new TransientLocalStorageNamespace());
</del><ins>+ return adoptRef(*new TransientLocalStorageNamespace());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~TransientLocalStorageNamespace()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
</del><ins>+ Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><span class="cx"> auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
</span><span class="cx"> if (slot)
</span><del>- return slot;
</del><ins>+ return *slot;
</ins><span class="cx">
</span><span class="cx"> auto storageArea = StorageArea::create(nullptr, WTF::move(securityOrigin), m_quotaInBytes);
</span><del>- slot = storageArea.get();
</del><ins>+ slot = &storageArea.get();
</ins><span class="cx">
</span><span class="cx"> return storageArea;
</span><span class="cx"> }
</span><span class="lines">@@ -154,9 +154,9 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, StorageArea*> m_storageAreaMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RefPtr<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</del><ins>+Ref<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><del>- return adoptRef(new StorageArea(localStorageNamespace, WTF::move(securityOrigin), quotaInBytes));
</del><ins>+ return adoptRef(*new StorageArea(localStorageNamespace, WTF::move(securityOrigin), quotaInBytes));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> m_eventListeners.remove(std::make_pair(connection, storageMapID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageManager::StorageArea> StorageManager::StorageArea::clone() const
</del><ins>+Ref<StorageManager::StorageArea> StorageManager::StorageArea::clone() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_localStorageNamespace);
</span><span class="cx">
</span><span class="lines">@@ -298,9 +298,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageManager::LocalStorageNamespace> StorageManager::LocalStorageNamespace::create(StorageManager* storageManager, uint64_t storageNamespaceID)
</del><ins>+Ref<StorageManager::LocalStorageNamespace> StorageManager::LocalStorageNamespace::create(StorageManager* storageManager, uint64_t storageNamespaceID)
</ins><span class="cx"> {
</span><del>- return adoptRef(new LocalStorageNamespace(storageManager, storageNamespaceID));
</del><ins>+ return adoptRef(*new LocalStorageNamespace(storageManager, storageNamespaceID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: The quota value is copied from GroupSettings.cpp.
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::SessionStorageNamespace : public ThreadSafeRefCounted<SessionStorageNamespace> {
</span><span class="cx"> public:
</span><del>- static RefPtr<SessionStorageNamespace> create(IPC::Connection* allowedConnection, unsigned quotaInBytes);
</del><ins>+ static Ref<SessionStorageNamespace> create(IPC::Connection* allowedConnection, 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">@@ -378,9 +378,9 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(IPC::Connection* allowedConnection, unsigned quotaInBytes)
</del><ins>+Ref<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(IPC::Connection* allowedConnection, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><del>- return adoptRef(new SessionStorageNamespace(allowedConnection, quotaInBytes));
</del><ins>+ return adoptRef(*new SessionStorageNamespace(allowedConnection, quotaInBytes));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageManager::SessionStorageNamespace::SessionStorageNamespace(IPC::Connection* allowedConnection, unsigned quotaInBytes)
</span><span class="lines">@@ -417,9 +417,9 @@
</span><span class="cx"> newSessionStorageNamespace.m_storageAreaMap.add(it->key, it->value->clone());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageManager> StorageManager::create(const String& localStorageDirectory)
</del><ins>+Ref<StorageManager> StorageManager::create(const String& localStorageDirectory)
</ins><span class="cx"> {
</span><del>- return adoptRef(new StorageManager(localStorageDirectory));
</del><ins>+ return adoptRef(*new StorageManager(localStorageDirectory));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageManager::StorageManager(const String& localStorageDirectory)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (177391 => 177392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-16 21:24:24 UTC (rev 177391)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-16 21:26:56 UTC (rev 177392)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager : public IPC::Connection::WorkQueueMessageReceiver {
</span><span class="cx"> public:
</span><del>- static RefPtr<StorageManager> create(const String& localStorageDirectory);
</del><ins>+ static Ref<StorageManager> create(const String& localStorageDirectory);
</ins><span class="cx"> ~StorageManager();
</span><span class="cx">
</span><span class="cx"> void createSessionStorageNamespace(uint64_t storageNamespaceID, IPC::Connection* allowedConnection, unsigned quotaInBytes);
</span></span></pre>
</div>
</div>
</body>
</html>