<!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>[184950] 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/184950">184950</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-05-28 01:18:55 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Handle WebCore::SecurityOrigin objects through Ref<> where possible
https://bugs.webkit.org/show_bug.cgi?id=145373
Reviewed by Andreas Kling.
WebCore::SecurityOrigin creation functions in most cases return a
Ref<WebCore::SecurityOrigin> object. In the WebKit2 layer, those objects
were still largely converted to RefPtr<>s.
This patch switches to using Ref<> where possible. The remaining uses of
RefPtr<WebCore::SecurityOrigin> are present due to HashTables, to-be-copied
Vectors, WebCore::DatabaseManager::origins() API and code where non-null
WebCore::SecurityOrigin can't be guaranteed.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesForOrigin):
* NetworkProcess/NetworkProcess.cpp:
(WebKit::cfURLCacheOrigins):
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::create):
(WebKit::LocalStorageDatabase::LocalStorageDatabase):
(WebKit::LocalStorageDatabase::openDatabase):
(WebKit::LocalStorageDatabase::close):
* UIProcess/Storage/LocalStorageDatabase.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::origins):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::securityOrigin):
(WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
(WebKit::StorageManager::TransientLocalStorageNamespace::origins):
(WebKit::StorageManager::TransientLocalStorageNamespace::clearStorageAreasMatchingOrigin):
(WebKit::StorageManager::StorageArea::create):
(WebKit::StorageManager::StorageArea::StorageArea):
(WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
(WebKit::StorageManager::LocalStorageNamespace::getOrCreateStorageArea):
(WebKit::StorageManager::LocalStorageNamespace::didDestroyStorageArea):
(WebKit::StorageManager::SessionStorageNamespace::origins):
(WebKit::StorageManager::SessionStorageNamespace::clearStorageAreasMatchingOrigin):
(WebKit::StorageManager::SessionStorageNamespace::getOrCreateStorageArea):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reachedApplicationCacheOriginQuota):
* WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
(WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setApplicationCacheOriginQuota):
(WebKit::InjectedBundle::resetApplicationCacheOriginQuota):
* WebProcess/ResourceCache/WebResourceCacheManager.cpp:
(WebKit::WebResourceCacheManager::returnCacheOrigins):
(WebKit::WebResourceCacheManager::clearCacheForOrigin):
* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
(WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
(WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
(WebKit::WebDatabaseManager::setQuotaForOrigin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp">trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagercpp">trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-05-28 Zan Dobersek <zdobersek@igalia.com>
+
+ [WK2] Handle WebCore::SecurityOrigin objects through Ref<> where possible
+ https://bugs.webkit.org/show_bug.cgi?id=145373
+
+ Reviewed by Andreas Kling.
+
+ WebCore::SecurityOrigin creation functions in most cases return a
+ Ref<WebCore::SecurityOrigin> object. In the WebKit2 layer, those objects
+ were still largely converted to RefPtr<>s.
+
+ This patch switches to using Ref<> where possible. The remaining uses of
+ RefPtr<WebCore::SecurityOrigin> are present due to HashTables, to-be-copied
+ Vectors, WebCore::DatabaseManager::origins() API and code where non-null
+ WebCore::SecurityOrigin can't be guaranteed.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesForOrigin):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::cfURLCacheOrigins):
+ * UIProcess/Storage/LocalStorageDatabase.cpp:
+ (WebKit::LocalStorageDatabase::create):
+ (WebKit::LocalStorageDatabase::LocalStorageDatabase):
+ (WebKit::LocalStorageDatabase::openDatabase):
+ (WebKit::LocalStorageDatabase::close):
+ * UIProcess/Storage/LocalStorageDatabase.h:
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::origins):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::securityOrigin):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::origins):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::clearStorageAreasMatchingOrigin):
+ (WebKit::StorageManager::StorageArea::create):
+ (WebKit::StorageManager::StorageArea::StorageArea):
+ (WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
+ (WebKit::StorageManager::LocalStorageNamespace::getOrCreateStorageArea):
+ (WebKit::StorageManager::LocalStorageNamespace::didDestroyStorageArea):
+ (WebKit::StorageManager::SessionStorageNamespace::origins):
+ (WebKit::StorageManager::SessionStorageNamespace::clearStorageAreasMatchingOrigin):
+ (WebKit::StorageManager::SessionStorageNamespace::getOrCreateStorageArea):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reachedApplicationCacheOriginQuota):
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+ (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setApplicationCacheOriginQuota):
+ (WebKit::InjectedBundle::resetApplicationCacheOriginQuota):
+ * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
+ (WebKit::WebResourceCacheManager::returnCacheOrigins):
+ (WebKit::WebResourceCacheManager::clearCacheForOrigin):
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin):
+ (WebKit::WebDatabaseManager::deleteDatabasesForOrigin):
+ (WebKit::WebDatabaseManager::setQuotaForOrigin):
+
</ins><span class="cx"> 2015-05-19 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] When viewing an MJPEG stream as the main resource, only the first
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> if (m_indexedDatabaseDirectory.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> origin = originData.securityOrigin();
</del><ins>+ Ref<SecurityOrigin> origin = originData.securityOrigin();
</ins><span class="cx"> String databaseIdentifier = origin->databaseIdentifier();
</span><span class="cx"> String originPath = pathByAppendingComponent(m_indexedDatabaseDirectory, databaseIdentifier);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -268,9 +268,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><del>-static Vector<RefPtr<SecurityOrigin>> cfURLCacheOrigins()
</del><ins>+static Vector<Ref<SecurityOrigin>> cfURLCacheOrigins()
</ins><span class="cx"> {
</span><del>- Vector<RefPtr<SecurityOrigin>> result;
</del><ins>+ Vector<Ref<SecurityOrigin>> result;
</ins><span class="cx">
</span><span class="cx"> WebResourceCacheManager::cfURLCacheHostNamesWithCallback([&result](RetainPtr<CFArrayRef> cfURLHosts) {
</span><span class="cx"> for (CFIndex i = 0, size = CFArrayGetCount(cfURLHosts.get()); i < size; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -46,16 +46,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
</del><ins>+PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><del>- return adoptRef(new LocalStorageDatabase(queue, tracker, securityOrigin));
</del><ins>+ return adoptRef(new LocalStorageDatabase(queue, tracker, WTF::move(securityOrigin)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
</del><ins>+LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> : m_queue(queue)
</span><span class="cx"> , m_tracker(tracker)
</span><del>- , m_securityOrigin(securityOrigin)
- , m_databasePath(m_tracker->databasePath(m_securityOrigin.get()))
</del><ins>+ , m_securityOrigin(WTF::move(securityOrigin))
+ , m_databasePath(m_tracker->databasePath(m_securityOrigin.ptr()))
</ins><span class="cx"> , m_failedToOpenDatabase(false)
</span><span class="cx"> , m_didImportItems(false)
</span><span class="cx"> , m_isClosed(false)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_database.isOpen())
</span><del>- m_tracker->didOpenDatabaseWithOrigin(m_securityOrigin.get());
</del><ins>+ m_tracker->didOpenDatabaseWithOrigin(m_securityOrigin.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool LocalStorageDatabase::tryToOpenDatabase(DatabaseOpeningStrategy openingStrategy)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> m_database.close();
</span><span class="cx">
</span><span class="cx"> if (isEmpty)
</span><del>- m_tracker->deleteDatabaseWithOrigin(m_securityOrigin.get());
</del><ins>+ m_tracker->deleteDatabaseWithOrigin(m_securityOrigin.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LocalStorageDatabase::itemDidChange(const String& key, const String& value)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> class LocalStorageDatabase : public ThreadSafeRefCounted<LocalStorageDatabase> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
</del><ins>+ static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
</ins><span class="cx"> ~LocalStorageDatabase();
</span><span class="cx">
</span><span class="cx"> // Will block until the import is complete.
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
</del><ins>+ LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
</ins><span class="cx">
</span><span class="cx"> enum DatabaseOpeningStrategy {
</span><span class="cx"> CreateIfNonExistent,
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WorkQueue> m_queue;
</span><span class="cx"> RefPtr<LocalStorageDatabaseTracker> m_tracker;
</span><del>- RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
</del><ins>+ Ref<WebCore::SecurityOrigin> m_securityOrigin;
</ins><span class="cx">
</span><span class="cx"> String m_databasePath;
</span><span class="cx"> WebCore::SQLiteDatabase m_database;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -167,9 +167,9 @@
</span><span class="cx"> return deletedDatabaseOrigins;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
</del><ins>+Vector<Ref<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
</ins><span class="cx"> {
</span><del>- Vector<RefPtr<SecurityOrigin>> origins;
</del><ins>+ Vector<Ref<SecurityOrigin>> origins;
</ins><span class="cx"> origins.reserveInitialCapacity(m_origins.size());
</span><span class="cx">
</span><span class="cx"> for (const String& origin : m_origins)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // Returns a vector of the origins whose databases have been deleted.
</span><span class="cx"> Vector<Ref<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(std::chrono::system_clock::time_point);
</span><span class="cx">
</span><del>- Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
</del><ins>+ Vector<Ref<WebCore::SecurityOrigin>> origins() const;
</ins><span class="cx"> Vector<LocalStorageDetails> details();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::StorageArea : public ThreadSafeRefCounted<StorageManager::StorageArea> {
</span><span class="cx"> public:
</span><del>- static Ref<StorageArea> create(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
</del><ins>+ static Ref<StorageArea> create(LocalStorageNamespace*, Ref<SecurityOrigin>&&, unsigned quotaInBytes);
</ins><span class="cx"> ~StorageArea();
</span><span class="cx">
</span><del>- SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
</del><ins>+ SecurityOrigin& securityOrigin() { return m_securityOrigin.get(); }
</ins><span class="cx">
</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="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> bool isSessionStorage() const { return !m_localStorageNamespace; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit StorageArea(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
</del><ins>+ explicit StorageArea(LocalStorageNamespace*, Ref<SecurityOrigin>&&, unsigned quotaInBytes);
</ins><span class="cx">
</span><span class="cx"> void openDatabaseAndImportItemsIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> RefPtr<LocalStorageDatabase> m_localStorageDatabase;
</span><span class="cx"> bool m_didImportItemsFromDatabase;
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> m_securityOrigin;
</del><ins>+ Ref<SecurityOrigin> m_securityOrigin;
</ins><span class="cx"> unsigned m_quotaInBytes;
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageMap> m_storageMap;
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> StorageManager* storageManager() const { return m_storageManager; }
</span><span class="cx">
</span><del>- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&&);
</del><ins>+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&&);
</ins><span class="cx"> void didDestroyStorageArea(StorageArea*);
</span><span class="cx">
</span><span class="cx"> void clearStorageAreasMatchingOrigin(const SecurityOrigin&);
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
</del><ins>+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><del>- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
</del><ins>+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
</ins><span class="cx"> if (slot)
</span><span class="cx"> return *slot;
</span><span class="cx">
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> return storageArea;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<RefPtr<SecurityOrigin>> origins() const
</del><ins>+ Vector<Ref<SecurityOrigin>> origins() const
</ins><span class="cx"> {
</span><del>- Vector<RefPtr<SecurityOrigin>> origins;
</del><ins>+ Vector<Ref<SecurityOrigin>> origins;
</ins><span class="cx">
</span><span class="cx"> for (const auto& storageArea : m_storageAreaMap.values()) {
</span><span class="cx"> if (!storageArea->items().isEmpty())
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> void clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> for (auto& storageArea : m_storageAreaMap.values()) {
</span><del>- if (storageArea->securityOrigin()->equal(&securityOrigin))
</del><ins>+ if (storageArea->securityOrigin().equal(&securityOrigin))
</ins><span class="cx"> storageArea->clear();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -167,12 +167,12 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Ref<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</del><ins>+Ref<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, Ref<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new StorageArea(localStorageNamespace, WTF::move(securityOrigin), quotaInBytes));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</del><ins>+StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, Ref<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
</ins><span class="cx"> : m_localStorageNamespace(localStorageNamespace)
</span><span class="cx"> , m_didImportItemsFromDatabase(false)
</span><span class="cx"> , m_securityOrigin(WTF::move(securityOrigin))
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx">
</span><span class="cx"> // We open the database here even if we've already imported our items to ensure that the database is open if we need to write to it.
</span><span class="cx"> if (!m_localStorageDatabase)
</span><del>- m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.get());
</del><ins>+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (m_didImportItemsFromDatabase)
</span><span class="cx"> return;
</span><span class="lines">@@ -330,9 +330,9 @@
</span><span class="cx"> ASSERT(m_storageAreaMap.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StorageManager::StorageArea> StorageManager::LocalStorageNamespace::getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
</del><ins>+Ref<StorageManager::StorageArea> StorageManager::LocalStorageNamespace::getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><del>- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
</del><ins>+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
</ins><span class="cx"> if (slot)
</span><span class="cx"> return *slot;
</span><span class="cx">
</span><span class="lines">@@ -344,9 +344,9 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::LocalStorageNamespace::didDestroyStorageArea(StorageArea* storageArea)
</span><span class="cx"> {
</span><del>- ASSERT(m_storageAreaMap.contains(storageArea->securityOrigin()));
</del><ins>+ ASSERT(m_storageAreaMap.contains(&storageArea->securityOrigin()));
</ins><span class="cx">
</span><del>- m_storageAreaMap.remove(storageArea->securityOrigin());
</del><ins>+ m_storageAreaMap.remove(&storageArea->securityOrigin());
</ins><span class="cx"> if (!m_storageAreaMap.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -378,13 +378,13 @@
</span><span class="cx"> IPC::Connection* allowedConnection() const { return m_allowedConnection.get(); }
</span><span class="cx"> void setAllowedConnection(IPC::Connection*);
</span><span class="cx">
</span><del>- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&&);
</del><ins>+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&&);
</ins><span class="cx">
</span><span class="cx"> void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
</span><span class="cx">
</span><del>- Vector<RefPtr<SecurityOrigin>> origins() const
</del><ins>+ Vector<Ref<SecurityOrigin>> origins() const
</ins><span class="cx"> {
</span><del>- Vector<RefPtr<SecurityOrigin>> origins;
</del><ins>+ Vector<Ref<SecurityOrigin>> origins;
</ins><span class="cx">
</span><span class="cx"> for (const auto& storageArea : m_storageAreaMap.values()) {
</span><span class="cx"> if (!storageArea->items().isEmpty())
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> void clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> for (auto& storageArea : m_storageAreaMap.values()) {
</span><del>- if (storageArea->securityOrigin()->equal(&securityOrigin))
</del><ins>+ if (storageArea->securityOrigin().equal(&securityOrigin))
</ins><span class="cx"> storageArea->clear();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -438,9 +438,9 @@
</span><span class="cx"> m_allowedConnection = allowedConnection;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
</del><ins>+Ref<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><del>- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
</del><ins>+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
</ins><span class="cx"> if (!slot)
</span><span class="cx"> slot = StorageArea::create(0, WTF::move(securityOrigin), m_quotaInBytes);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -5127,10 +5127,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::reachedApplicationCacheOriginQuota(const String& originIdentifier, uint64_t currentQuota, uint64_t totalBytesNeeded, PassRefPtr<Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::DelayedReply> reply)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- MESSAGE_CHECK(securityOrigin);
-
- m_uiClient->reachedApplicationCacheOriginQuota(this, *securityOrigin.get(), currentQuota, totalBytesNeeded, [reply](unsigned long long newQuota) { reply->send(newQuota); });
</del><ins>+ Ref<SecurityOrigin> securityOrigin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
+ m_uiClient->reachedApplicationCacheOriginQuota(this, securityOrigin.get(), currentQuota, totalBytesNeeded, [reply](unsigned long long newQuota) { reply->send(newQuota); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -60,11 +60,7 @@
</span><span class="cx"> Vector<SecurityOriginData> identifiers;
</span><span class="cx"> identifiers.reserveCapacity(origins.size());
</span><span class="cx">
</span><del>- HashSet<RefPtr<SecurityOrigin>>::iterator end = origins.end();
- HashSet<RefPtr<SecurityOrigin>>::iterator i = origins.begin();
- for (; i != end; ++i) {
- RefPtr<SecurityOrigin> origin = *i;
-
</del><ins>+ for (auto& origin : origins) {
</ins><span class="cx"> SecurityOriginData originData;
</span><span class="cx"> originData.protocol = origin->protocol();
</span><span class="cx"> originData.host = origin->host();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -372,15 +372,15 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
- ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(origin.get(), bytes);
</del><ins>+ Ref<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
+ ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(origin.ptr(), bytes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
</del><ins>+ Ref<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
</ins><span class="cx"> auto& cacheStorage = ApplicationCacheStorage::singleton();
</span><del>- cacheStorage.storeUpdatedQuotaForOrigin(origin.get(), cacheStorage.defaultOriginQuota());
</del><ins>+ cacheStorage.storeUpdatedQuotaForOrigin(origin.ptr(), cacheStorage.defaultOriginQuota());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<API::Array> InjectedBundle::originsWithApplicationCache()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -77,10 +77,7 @@
</span><span class="cx"> Vector<SecurityOriginData> identifiers;
</span><span class="cx"> identifiers.reserveCapacity(origins.size());
</span><span class="cx">
</span><del>- MemoryCache::SecurityOriginSet::iterator end = origins.end();
- for (MemoryCache::SecurityOriginSet::iterator it = origins.begin(); it != end; ++it) {
- RefPtr<SecurityOrigin> origin = *it;
-
</del><ins>+ for (auto& origin : origins) {
</ins><span class="cx"> SecurityOriginData originData;
</span><span class="cx"> originData.protocol = origin->protocol();
</span><span class="cx"> originData.host = origin->host();
</span><span class="lines">@@ -100,12 +97,9 @@
</span><span class="cx"> UNUSED_PARAM(cachesToClear);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
- if (!origin)
- return;
</del><ins>+ Ref<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
+ MemoryCache::singleton().removeResourcesWithOrigin(origin.get());
</ins><span class="cx">
</span><del>- MemoryCache::singleton().removeResourcesWithOrigin(*origin);
-
</del><span class="cx"> #if USE(CFURLCACHE)
</span><span class="cx"> if (resourceCachesToClear != InMemoryResourceCachesOnly) {
</span><span class="cx"> RetainPtr<CFMutableArrayRef> hostArray = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -116,20 +116,12 @@
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().deleteDatabase(origin.get(), databaseIdentifier);
</del><ins>+ DatabaseManager::singleton().deleteDatabase(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), databaseIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().deleteOrigin(origin.get());
</del><ins>+ DatabaseManager::singleton().deleteOrigin(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManager::deleteAllDatabases() const
</span><span class="lines">@@ -147,12 +139,7 @@
</span><span class="cx"> // If the quota is set to a value lower than the current usage, that quota will
</span><span class="cx"> // "stick" but no data will be purged to meet the new quota. This will simply
</span><span class="cx"> // prevent new data from being added to databases in that origin.
</span><del>-
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().setQuota(origin.get(), quota);
</del><ins>+ DatabaseManager::singleton().setQuota(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManager::dispatchDidModifyOrigin(SecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (184949 => 184950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-05-28 08:13:10 UTC (rev 184949)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-05-28 08:18:55 UTC (rev 184950)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> URL mainFrameURL(URL(), mainFrame->url());
</span><del>- RefPtr<SecurityOrigin> mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
</del><ins>+ Ref<SecurityOrigin> mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
</ins><span class="cx"> String mainFrameOriginString;
</span><span class="cx"> if (!mainFrameOrigin->isUnique())
</span><span class="cx"> mainFrameOriginString = mainFrameOrigin->toRawString();
</span></span></pre>
</div>
</div>
</body>
</html>