Modified: trunk/Source/WebKit2/ChangeLog (215075 => 215076)
--- trunk/Source/WebKit2/ChangeLog 2017-04-07 00:38:42 UTC (rev 215075)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-07 00:39:22 UTC (rev 215076)
@@ -1,3 +1,16 @@
+2017-04-06 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r214973.
+ https://bugs.webkit.org/show_bug.cgi?id=170578
+
+ Causes issues in Safari (Requested by bradee-oh on #webkit).
+
+ Reverted changeset:
+
+ "Refactor so WebsiteDataStores always have a StorageManager."
+ https://bugs.webkit.org/show_bug.cgi?id=170521
+ http://trac.webkit.org/changeset/214973
+
2017-04-06 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r215046.
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (215075 => 215076)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2017-04-07 00:38:42 UTC (rev 215075)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2017-04-07 00:39:22 UTC (rev 215076)
@@ -281,12 +281,12 @@
void StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded() const
{
- if (!m_localStorageNamespace || !m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker)
+ if (!m_localStorageNamespace)
return;
// 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.copyRef(), *m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin);
+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker.copyRef(), m_securityOrigin);
if (m_didImportItemsFromDatabase)
return;
@@ -451,17 +451,10 @@
return adoptRef(*new StorageManager(localStorageDirectory));
}
-Ref<StorageManager> StorageManager::createEphemeral()
-{
- return adoptRef(*new StorageManager({ }));
-}
-
StorageManager::StorageManager(const String& localStorageDirectory)
: m_queue(WorkQueue::create("com.apple.WebKit.StorageManager"))
+ , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory))
{
- if (!localStorageDirectory.isEmpty())
- m_localStorageDatabaseTracker = LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory);
-
// Make sure the encoding is initialized before we start dispatching things to the queue.
UTF8Encoding();
}
@@ -587,10 +580,8 @@
m_queue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
HashSet<SecurityOriginData> origins;
- if (m_localStorageDatabaseTracker) {
- for (auto& origin : m_localStorageDatabaseTracker->origins())
- origins.add(origin);
- }
+ for (auto& origin : m_localStorageDatabaseTracker->origins())
+ origins.add(origin);
for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values()) {
for (auto& origin : transientLocalStorageNamespace->origins())
@@ -606,9 +597,7 @@
void StorageManager::getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)>&& completionHandler)
{
m_queue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
- Vector<LocalStorageDatabaseTracker::OriginDetails> originDetails;
- if (m_localStorageDatabaseTracker)
- originDetails = m_localStorageDatabaseTracker->originDetails();
+ auto originDetails = m_localStorageDatabaseTracker->originDetails();
RunLoop::main().dispatch([originDetails = WTFMove(originDetails), completionHandler = WTFMove(completionHandler)]() mutable {
completionHandler(WTFMove(originDetails));
@@ -625,8 +614,7 @@
for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(copiedOrigin);
- if (m_localStorageDatabaseTracker)
- m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
+ m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
});
}
@@ -633,9 +621,7 @@
void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void()>&& completionHandler)
{
m_queue->dispatch([this, protectedThis = makeRef(*this), time, completionHandler = WTFMove(completionHandler)]() mutable {
- Vector<WebCore::SecurityOriginData> deletedOrigins;
- if (m_localStorageDatabaseTracker)
- deletedOrigins = m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
+ auto deletedOrigins = m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
for (const auto& origin : deletedOrigins) {
for (auto& localStorageNamespace : m_localStorageNamespaces.values())
@@ -665,8 +651,7 @@
for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(origin);
- if (m_localStorageDatabaseTracker)
- m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
+ m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
}
RunLoop::main().dispatch(WTFMove(completionHandler));
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (215075 => 215076)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2017-04-07 00:38:42 UTC (rev 215075)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2017-04-07 00:39:22 UTC (rev 215076)
@@ -47,7 +47,6 @@
class StorageManager : public IPC::Connection::WorkQueueMessageReceiver {
public:
static Ref<StorageManager> create(const String& localStorageDirectory);
- static Ref<StorageManager> createEphemeral();
~StorageManager();
void createSessionStorageNamespace(uint64_t storageNamespaceID, unsigned quotaInBytes);
@@ -100,7 +99,7 @@
Ref<WorkQueue> m_queue;
- RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
+ Ref<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
HashMap<std::pair<uint64_t, WebCore::SecurityOriginData>, RefPtr<TransientLocalStorageNamespace>> m_transientLocalStorageNamespaces;
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (215075 => 215076)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-07 00:38:42 UTC (rev 215075)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-07 00:39:22 UTC (rev 215076)
@@ -91,7 +91,6 @@
: m_identifier(generateIdentifier())
, m_sessionID(sessionID)
, m_configuration()
- , m_storageManager(StorageManager::createEphemeral())
, m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
{
platformInitialize();
