Diff
Modified: trunk/Source/WebKit2/ChangeLog (184949 => 184950)
--- 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)
@@ -1,3 +1,60 @@
+2015-05-28 Zan Dobersek <zdober...@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):
+
2015-05-19 Jon Honeycutt <jhoneyc...@apple.com>
[iOS] When viewing an MJPEG stream as the main resource, only the first
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (184949 => 184950)
--- 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)
@@ -368,7 +368,7 @@
if (m_indexedDatabaseDirectory.isEmpty())
return;
- RefPtr<SecurityOrigin> origin = originData.securityOrigin();
+ Ref<SecurityOrigin> origin = originData.securityOrigin();
String databaseIdentifier = origin->databaseIdentifier();
String originPath = pathByAppendingComponent(m_indexedDatabaseDirectory, databaseIdentifier);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (184949 => 184950)
--- 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)
@@ -268,9 +268,9 @@
}
#if USE(CFURLCACHE)
-static Vector<RefPtr<SecurityOrigin>> cfURLCacheOrigins()
+static Vector<Ref<SecurityOrigin>> cfURLCacheOrigins()
{
- Vector<RefPtr<SecurityOrigin>> result;
+ Vector<Ref<SecurityOrigin>> result;
WebResourceCacheManager::cfURLCacheHostNamesWithCallback([&result](RetainPtr<CFArrayRef> cfURLHosts) {
for (CFIndex i = 0, size = CFArrayGetCount(cfURLHosts.get()); i < size; ++i) {
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (184949 => 184950)
--- 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)
@@ -46,16 +46,16 @@
namespace WebKit {
-PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
+PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
{
- return adoptRef(new LocalStorageDatabase(queue, tracker, securityOrigin));
+ return adoptRef(new LocalStorageDatabase(queue, tracker, WTF::move(securityOrigin)));
}
-LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
+LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
: m_queue(queue)
, m_tracker(tracker)
- , m_securityOrigin(securityOrigin)
- , m_databasePath(m_tracker->databasePath(m_securityOrigin.get()))
+ , m_securityOrigin(WTF::move(securityOrigin))
+ , m_databasePath(m_tracker->databasePath(m_securityOrigin.ptr()))
, m_failedToOpenDatabase(false)
, m_didImportItems(false)
, m_isClosed(false)
@@ -80,7 +80,7 @@
}
if (m_database.isOpen())
- m_tracker->didOpenDatabaseWithOrigin(m_securityOrigin.get());
+ m_tracker->didOpenDatabaseWithOrigin(m_securityOrigin.ptr());
}
bool LocalStorageDatabase::tryToOpenDatabase(DatabaseOpeningStrategy openingStrategy)
@@ -227,7 +227,7 @@
m_database.close();
if (isEmpty)
- m_tracker->deleteDatabaseWithOrigin(m_securityOrigin.get());
+ m_tracker->deleteDatabaseWithOrigin(m_securityOrigin.ptr());
}
void LocalStorageDatabase::itemDidChange(const String& key, const String& value)
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h (184949 => 184950)
--- 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)
@@ -45,7 +45,7 @@
class LocalStorageDatabase : public ThreadSafeRefCounted<LocalStorageDatabase> {
public:
- static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
+ static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
~LocalStorageDatabase();
// Will block until the import is complete.
@@ -59,7 +59,7 @@
void close();
private:
- LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
+ LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
enum DatabaseOpeningStrategy {
CreateIfNonExistent,
@@ -80,7 +80,7 @@
RefPtr<WorkQueue> m_queue;
RefPtr<LocalStorageDatabaseTracker> m_tracker;
- RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
+ Ref<WebCore::SecurityOrigin> m_securityOrigin;
String m_databasePath;
WebCore::SQLiteDatabase m_database;
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (184949 => 184950)
--- 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)
@@ -167,9 +167,9 @@
return deletedDatabaseOrigins;
}
-Vector<RefPtr<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
+Vector<Ref<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
{
- Vector<RefPtr<SecurityOrigin>> origins;
+ Vector<Ref<SecurityOrigin>> origins;
origins.reserveInitialCapacity(m_origins.size());
for (const String& origin : m_origins)
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (184949 => 184950)
--- 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)
@@ -57,7 +57,7 @@
// Returns a vector of the origins whose databases have been deleted.
Vector<Ref<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(std::chrono::system_clock::time_point);
- Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
+ Vector<Ref<WebCore::SecurityOrigin>> origins() const;
Vector<LocalStorageDetails> details();
private:
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (184949 => 184950)
--- 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)
@@ -46,10 +46,10 @@
class StorageManager::StorageArea : public ThreadSafeRefCounted<StorageManager::StorageArea> {
public:
- static Ref<StorageArea> create(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
+ static Ref<StorageArea> create(LocalStorageNamespace*, Ref<SecurityOrigin>&&, unsigned quotaInBytes);
~StorageArea();
- SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
+ SecurityOrigin& securityOrigin() { return m_securityOrigin.get(); }
void addListener(IPC::Connection&, uint64_t storageMapID);
void removeListener(IPC::Connection&, uint64_t storageMapID);
@@ -66,7 +66,7 @@
bool isSessionStorage() const { return !m_localStorageNamespace; }
private:
- explicit StorageArea(LocalStorageNamespace*, RefPtr<SecurityOrigin>&&, unsigned quotaInBytes);
+ explicit StorageArea(LocalStorageNamespace*, Ref<SecurityOrigin>&&, unsigned quotaInBytes);
void openDatabaseAndImportItemsIfNeeded();
@@ -77,7 +77,7 @@
RefPtr<LocalStorageDatabase> m_localStorageDatabase;
bool m_didImportItemsFromDatabase;
- RefPtr<SecurityOrigin> m_securityOrigin;
+ Ref<SecurityOrigin> m_securityOrigin;
unsigned m_quotaInBytes;
RefPtr<StorageMap> m_storageMap;
@@ -91,7 +91,7 @@
StorageManager* storageManager() const { return m_storageManager; }
- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&&);
+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&&);
void didDestroyStorageArea(StorageArea*);
void clearStorageAreasMatchingOrigin(const SecurityOrigin&);
@@ -119,9 +119,9 @@
{
}
- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
{
- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
if (slot)
return *slot;
@@ -131,9 +131,9 @@
return storageArea;
}
- Vector<RefPtr<SecurityOrigin>> origins() const
+ Vector<Ref<SecurityOrigin>> origins() const
{
- Vector<RefPtr<SecurityOrigin>> origins;
+ Vector<Ref<SecurityOrigin>> origins;
for (const auto& storageArea : m_storageAreaMap.values()) {
if (!storageArea->items().isEmpty())
@@ -146,7 +146,7 @@
void clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
{
for (auto& storageArea : m_storageAreaMap.values()) {
- if (storageArea->securityOrigin()->equal(&securityOrigin))
+ if (storageArea->securityOrigin().equal(&securityOrigin))
storageArea->clear();
}
}
@@ -167,12 +167,12 @@
HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
};
-Ref<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
+Ref<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, Ref<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
{
return adoptRef(*new StorageArea(localStorageNamespace, WTF::move(securityOrigin), quotaInBytes));
}
-StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, RefPtr<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
+StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, Ref<SecurityOrigin>&& securityOrigin, unsigned quotaInBytes)
: m_localStorageNamespace(localStorageNamespace)
, m_didImportItemsFromDatabase(false)
, m_securityOrigin(WTF::move(securityOrigin))
@@ -293,7 +293,7 @@
// 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.
if (!m_localStorageDatabase)
- m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.get());
+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.copyRef());
if (m_didImportItemsFromDatabase)
return;
@@ -330,9 +330,9 @@
ASSERT(m_storageAreaMap.isEmpty());
}
-Ref<StorageManager::StorageArea> StorageManager::LocalStorageNamespace::getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
+Ref<StorageManager::StorageArea> StorageManager::LocalStorageNamespace::getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
{
- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
if (slot)
return *slot;
@@ -344,9 +344,9 @@
void StorageManager::LocalStorageNamespace::didDestroyStorageArea(StorageArea* storageArea)
{
- ASSERT(m_storageAreaMap.contains(storageArea->securityOrigin()));
+ ASSERT(m_storageAreaMap.contains(&storageArea->securityOrigin()));
- m_storageAreaMap.remove(storageArea->securityOrigin());
+ m_storageAreaMap.remove(&storageArea->securityOrigin());
if (!m_storageAreaMap.isEmpty())
return;
@@ -378,13 +378,13 @@
IPC::Connection* allowedConnection() const { return m_allowedConnection.get(); }
void setAllowedConnection(IPC::Connection*);
- Ref<StorageArea> getOrCreateStorageArea(RefPtr<SecurityOrigin>&&);
+ Ref<StorageArea> getOrCreateStorageArea(Ref<SecurityOrigin>&&);
void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
- Vector<RefPtr<SecurityOrigin>> origins() const
+ Vector<Ref<SecurityOrigin>> origins() const
{
- Vector<RefPtr<SecurityOrigin>> origins;
+ Vector<Ref<SecurityOrigin>> origins;
for (const auto& storageArea : m_storageAreaMap.values()) {
if (!storageArea->items().isEmpty())
@@ -397,7 +397,7 @@
void clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
{
for (auto& storageArea : m_storageAreaMap.values()) {
- if (storageArea->securityOrigin()->equal(&securityOrigin))
+ if (storageArea->securityOrigin().equal(&securityOrigin))
storageArea->clear();
}
}
@@ -438,9 +438,9 @@
m_allowedConnection = allowedConnection;
}
-Ref<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(RefPtr<SecurityOrigin>&& securityOrigin)
+Ref<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(Ref<SecurityOrigin>&& securityOrigin)
{
- auto& slot = m_storageAreaMap.add(securityOrigin, nullptr).iterator->value;
+ auto& slot = m_storageAreaMap.add(securityOrigin.ptr(), nullptr).iterator->value;
if (!slot)
slot = StorageArea::create(0, WTF::move(securityOrigin), m_quotaInBytes);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (184949 => 184950)
--- 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)
@@ -5127,10 +5127,8 @@
void WebPageProxy::reachedApplicationCacheOriginQuota(const String& originIdentifier, uint64_t currentQuota, uint64_t totalBytesNeeded, PassRefPtr<Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::DelayedReply> reply)
{
- 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); });
+ Ref<SecurityOrigin> securityOrigin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
+ m_uiClient->reachedApplicationCacheOriginQuota(this, securityOrigin.get(), currentQuota, totalBytesNeeded, [reply](unsigned long long newQuota) { reply->send(newQuota); });
}
void WebPageProxy::requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier)
Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (184949 => 184950)
--- 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)
@@ -60,11 +60,7 @@
Vector<SecurityOriginData> identifiers;
identifiers.reserveCapacity(origins.size());
- HashSet<RefPtr<SecurityOrigin>>::iterator end = origins.end();
- HashSet<RefPtr<SecurityOrigin>>::iterator i = origins.begin();
- for (; i != end; ++i) {
- RefPtr<SecurityOrigin> origin = *i;
-
+ for (auto& origin : origins) {
SecurityOriginData originData;
originData.protocol = origin->protocol();
originData.host = origin->host();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (184949 => 184950)
--- 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)
@@ -372,15 +372,15 @@
void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)
{
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
- ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(origin.get(), bytes);
+ Ref<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
+ ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(origin.ptr(), bytes);
}
void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)
{
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
+ Ref<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
auto& cacheStorage = ApplicationCacheStorage::singleton();
- cacheStorage.storeUpdatedQuotaForOrigin(origin.get(), cacheStorage.defaultOriginQuota());
+ cacheStorage.storeUpdatedQuotaForOrigin(origin.ptr(), cacheStorage.defaultOriginQuota());
}
PassRefPtr<API::Array> InjectedBundle::originsWithApplicationCache()
Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp (184949 => 184950)
--- 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)
@@ -77,10 +77,7 @@
Vector<SecurityOriginData> identifiers;
identifiers.reserveCapacity(origins.size());
- MemoryCache::SecurityOriginSet::iterator end = origins.end();
- for (MemoryCache::SecurityOriginSet::iterator it = origins.begin(); it != end; ++it) {
- RefPtr<SecurityOrigin> origin = *it;
-
+ for (auto& origin : origins) {
SecurityOriginData originData;
originData.protocol = origin->protocol();
originData.host = origin->host();
@@ -100,12 +97,9 @@
UNUSED_PARAM(cachesToClear);
#endif
- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
- if (!origin)
- return;
+ Ref<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
+ MemoryCache::singleton().removeResourcesWithOrigin(origin.get());
- MemoryCache::singleton().removeResourcesWithOrigin(*origin);
-
#if USE(CFURLCACHE)
if (resourceCachesToClear != InMemoryResourceCachesOnly) {
RetainPtr<CFMutableArrayRef> hostArray = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (184949 => 184950)
--- 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)
@@ -116,20 +116,12 @@
void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const
{
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().deleteDatabase(origin.get(), databaseIdentifier);
+ DatabaseManager::singleton().deleteDatabase(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), databaseIdentifier);
}
void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const
{
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().deleteOrigin(origin.get());
+ DatabaseManager::singleton().deleteOrigin(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr());
}
void WebDatabaseManager::deleteAllDatabases() const
@@ -147,12 +139,7 @@
// If the quota is set to a value lower than the current usage, that quota will
// "stick" but no data will be purged to meet the new quota. This will simply
// prevent new data from being added to databases in that origin.
-
- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromDatabaseIdentifier(originIdentifier);
- if (!origin)
- return;
-
- DatabaseManager::singleton().setQuota(origin.get(), quota);
+ DatabaseManager::singleton().setQuota(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), quota);
}
void WebDatabaseManager::dispatchDidModifyOrigin(SecurityOrigin* origin)
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (184949 => 184950)
--- 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)
@@ -266,7 +266,7 @@
return nil;
URL mainFrameURL(URL(), mainFrame->url());
- RefPtr<SecurityOrigin> mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
+ Ref<SecurityOrigin> mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
String mainFrameOriginString;
if (!mainFrameOrigin->isUnique())
mainFrameOriginString = mainFrameOrigin->toRawString();
