Dispatch storage manager messages to the storage work queue

https://bugs.webkit.org/show_bug.cgi?id=109099

Reviewed by Andreas Kling.

* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::didReceiveMessageOnConnectionWorkQueue):
(WebKit::StorageManager::dispatchMessageOnStorageManagerQueue):
(WebKit):
* UIProcess/Storage/StorageManager.h:
(StorageManager):

Canonical link: https://commits.webkit.org/127292@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,17 @@
+2013-02-06  Anders Carlsson  <andersca@apple.com>
+
+        Dispatch storage manager messages to the storage work queue
+        https://bugs.webkit.org/show_bug.cgi?id=109099
+
+        Reviewed by Andreas Kling.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::didReceiveMessageOnConnectionWorkQueue):
+        (WebKit::StorageManager::dispatchMessageOnStorageManagerQueue):
+        (WebKit):
+        * UIProcess/Storage/StorageManager.h:
+        (StorageManager):
+
 2013-02-06  Anders Carlsson  <andersca@apple.com>
 
         Pass the document source URL to the pluginLoadPolicy callback

Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -59,7 +59,8 @@ void StorageManager::processWillCloseConnection(WebProcessProxy* webProcessProxy
 void StorageManager::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, OwnPtr<CoreIPC::MessageDecoder>& decoder)
 {
     if (decoder->messageReceiverName() == Messages::StorageManager::messageReceiverName()) {
-        didReceiveStorageManagerMessageOnConnectionWorkQueue(connection, decoder);
+        // FIXME: We should come up with a better way to automatically dispatch messages on a given work queue.
+        m_queue->dispatch(bind(&StorageManager::dispatchMessageOnStorageManagerQueue, this, RefPtr<CoreIPC::Connection>(connection), decoder.leakPtr()));
         return;
     }
 }
@@ -78,4 +79,14 @@ void StorageManager::destroyStorageArea(CoreIPC::Connection*, uint64_t)
 {
 }
 
+void StorageManager::dispatchMessageOnStorageManagerQueue(CoreIPC::Connection* connection, CoreIPC::MessageDecoder* decoder)
+{
+    ASSERT(decoder->messageReceiverName() == Messages::StorageManager::messageReceiverName());
+
+    OwnPtr<CoreIPC::MessageDecoder> decoderPtr = adoptPtr(decoder);
+    didReceiveStorageManagerMessageOnConnectionWorkQueue(connection, decoderPtr);
+
+    ASSERT(!decoderPtr);
+}
+
 } // namespace WebKit

Source/WebKit2/UIProcess/Storage/StorageManager.h

@@ -58,6 +58,8 @@ class StorageManager : public ThreadSafeRefCounted<StorageManager>, private Core
     void createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&);
     void destroyStorageArea(CoreIPC::Connection*, uint64_t storageAreaID);
 
+    void dispatchMessageOnStorageManagerQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder*);
+
     RefPtr<WorkQueue> m_queue;
 };