Diff
Modified: trunk/Source/WebKit2/ChangeLog (203250 => 203251)
--- trunk/Source/WebKit2/ChangeLog 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-14 23:21:34 UTC (rev 203251)
@@ -1,3 +1,15 @@
+2016-07-14 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r203248.
+
+ This change causes LayoutTests to crash and exit early
+
+ Reverted changeset:
+
+ "Use more Refs with WorkQueues"
+ https://bugs.webkit.org/show_bug.cgi?id=159792
+ http://trac.webkit.org/changeset/203248
+
2016-07-14 Chris Dumez <[email protected]>
Use emptyString() instead of "" when possible
Modified: trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h (203250 => 203251)
--- trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2016-07-14 23:21:34 UTC (rev 203251)
@@ -97,7 +97,7 @@
void wasRedirectedToRequest(uint64_t customProtocolID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
ChildProcess* m_childProcess;
- Ref<WorkQueue> m_messageQueue;
+ RefPtr<WorkQueue> m_messageQueue;
#if PLATFORM(COCOA)
HashSet<String, ASCIICaseInsensitiveHash> m_registeredSchemes;
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (203250 => 203251)
--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -249,14 +249,14 @@
m_shouldExitOnSyncMessageSendFailure = shouldExitOnSyncMessageSendFailure;
}
-void Connection::addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue& workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
+void Connection::addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue* workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
{
ASSERT(RunLoop::isMain());
- m_connectionQueue->dispatch([protectedThis = Ref<Connection>(*this), messageReceiverName = WTFMove(messageReceiverName), workQueue = Ref<WorkQueue>(workQueue), workQueueMessageReceiver]() mutable {
+ m_connectionQueue->dispatch([protectedThis = Ref<Connection>(*this), messageReceiverName = WTFMove(messageReceiverName), workQueue, workQueueMessageReceiver]() mutable {
ASSERT(!protectedThis->m_workQueueMessageReceivers.contains(messageReceiverName));
- protectedThis->m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(WTFMove(workQueue), workQueueMessageReceiver));
+ protectedThis->m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(workQueue, workQueueMessageReceiver));
});
}
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (203250 => 203251)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-07-14 23:21:34 UTC (rev 203251)
@@ -160,7 +160,7 @@
typedef void (*DidCloseOnConnectionWorkQueueCallback)(Connection*);
void setDidCloseOnConnectionWorkQueueCallback(DidCloseOnConnectionWorkQueueCallback callback);
- void addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue&, WorkQueueMessageReceiver*);
+ void addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue*, WorkQueueMessageReceiver*);
void removeWorkQueueMessageReceiver(StringReference messageReceiverName);
bool open();
@@ -251,7 +251,7 @@
bool m_isConnected;
Ref<WorkQueue> m_connectionQueue;
- HashMap<StringReference, std::pair<Ref<WorkQueue>, RefPtr<WorkQueueMessageReceiver>>> m_workQueueMessageReceivers;
+ HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver>>> m_workQueueMessageReceivers;
unsigned m_inSendSyncCount;
unsigned m_inDispatchMessageCount;
Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (203250 => 203251)
--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -178,7 +178,7 @@
void SecItemShim::initializeConnection(IPC::Connection* connection)
{
- connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), m_queue.get(), this);
+ connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), &m_queue.get(), this);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -38,13 +38,13 @@
namespace WebKit {
-Ref<LocalStorageDatabaseTracker> LocalStorageDatabaseTracker::create(Ref<WorkQueue>&& queue, const String& localStorageDirectory)
+PassRefPtr<LocalStorageDatabaseTracker> LocalStorageDatabaseTracker::create(PassRefPtr<WorkQueue> queue, const String& localStorageDirectory)
{
- return adoptRef(*new LocalStorageDatabaseTracker(WTFMove(queue), localStorageDirectory));
+ return adoptRef(new LocalStorageDatabaseTracker(queue, localStorageDirectory));
}
-LocalStorageDatabaseTracker::LocalStorageDatabaseTracker(Ref<WorkQueue>&& queue, const String& localStorageDirectory)
- : m_queue(WTFMove(queue))
+LocalStorageDatabaseTracker::LocalStorageDatabaseTracker(PassRefPtr<WorkQueue> queue, const String& localStorageDirectory)
+ : m_queue(queue)
, m_localStorageDirectory(localStorageDirectory.isolatedCopy())
{
ASSERT(!m_localStorageDirectory.isEmpty());
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-07-14 23:21:34 UTC (rev 203251)
@@ -23,7 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#ifndef LocalStorageDatabaseTracker_h
+#define LocalStorageDatabaseTracker_h
#include <WebCore/SQLiteDatabase.h>
#include <wtf/HashSet.h>
@@ -45,7 +46,7 @@
class LocalStorageDatabaseTracker : public ThreadSafeRefCounted<LocalStorageDatabaseTracker> {
public:
- static Ref<LocalStorageDatabaseTracker> create(Ref<WorkQueue>&&, const String& localStorageDirectory);
+ static PassRefPtr<LocalStorageDatabaseTracker> create(PassRefPtr<WorkQueue>, const String& localStorageDirectory);
~LocalStorageDatabaseTracker();
String databasePath(WebCore::SecurityOrigin*) const;
@@ -67,7 +68,7 @@
Vector<OriginDetails> originDetails();
private:
- LocalStorageDatabaseTracker(Ref<WorkQueue>&&, const String& localStorageDirectory);
+ LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>, const String& localStorageDirectory);
String databasePath(const String& filename) const;
String trackerDatabasePath() const;
@@ -85,7 +86,7 @@
void removeDatabaseWithOriginIdentifier(const String& originIdentifier);
String pathForDatabaseWithOriginIdentifier(const String& originIdentifier);
- Ref<WorkQueue> m_queue;
+ RefPtr<WorkQueue> m_queue;
String m_localStorageDirectory;
WebCore::SQLiteDatabase m_database;
@@ -93,3 +94,5 @@
};
} // namespace WebKit
+
+#endif // LocalStorageDatabaseTracker_h
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -292,7 +292,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.copyRef(), m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.copyRef());
+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.copyRef());
if (m_didImportItemsFromDatabase)
return;
@@ -461,7 +461,7 @@
StorageManager::StorageManager(const String& localStorageDirectory)
: m_queue(WorkQueue::create("com.apple.WebKit.StorageManager"))
- , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory))
+ , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue, localStorageDirectory))
{
// Make sure the encoding is initialized before we start dispatching things to the queue.
UTF8Encoding();
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-07-14 23:21:34 UTC (rev 203251)
@@ -98,7 +98,7 @@
class TransientLocalStorageNamespace;
TransientLocalStorageNamespace* getOrCreateTransientLocalStorageNamespace(uint64_t storageNamespaceID, WebCore::SecurityOrigin& topLevelOrigin);
- Ref<WorkQueue> m_queue;
+ RefPtr<WorkQueue> m_queue;
RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -130,7 +130,7 @@
void WebResourceLoadStatisticsStore::processWillOpenConnection(WebProcessProxy&, IPC::Connection& connection)
{
- connection.addWorkQueueMessageReceiver(Messages::WebResourceLoadStatisticsStore::messageReceiverName(), m_statisticsQueue.get(), this);
+ connection.addWorkQueueMessageReceiver(Messages::WebResourceLoadStatisticsStore::messageReceiverName(), &m_statisticsQueue.get(), this);
}
void WebResourceLoadStatisticsStore::processDidCloseConnection(WebProcessProxy&, IPC::Connection& connection)
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (203250 => 203251)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -54,7 +54,7 @@
void SecItemShimProxy::initializeConnection(IPC::Connection& connection)
{
- connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
+ connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), &m_queue.get(), this);
}
void SecItemShimProxy::secItemRequest(IPC::Connection& connection, uint64_t requestID, const SecItemRequestData& request)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (203250 => 203251)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -58,7 +58,7 @@
void PluginProcessConnectionManager::initializeConnection(IPC::Connection* connection)
{
- connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), m_queue.get(), this);
+ connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), &m_queue.get(), this);
}
PluginProcessConnection* PluginProcessConnectionManager::getPluginProcessConnection(uint64_t pluginProcessToken)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (203250 => 203251)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -85,7 +85,7 @@
void EventDispatcher::initializeConnection(IPC::Connection* connection)
{
- connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
+ connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), &m_queue.get(), this);
}
void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp (203250 => 203251)
--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2016-07-14 23:17:51 UTC (rev 203250)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2016-07-14 23:21:34 UTC (rev 203251)
@@ -51,7 +51,7 @@
void ViewUpdateDispatcher::initializeConnection(IPC::Connection* connection)
{
- connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), m_queue.get(), this);
+ connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), &m_queue.get(), this);
}
void ViewUpdateDispatcher::visibleContentRectUpdate(uint64_t pageID, const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo)
