Title: [142781] trunk/Source/WebKit2
- Revision
- 142781
- Author
- [email protected]
- Date
- 2013-02-13 13:17:00 -0800 (Wed, 13 Feb 2013)
Log Message
StorageManager should be a WorkQueueMessageReceiver
https://bugs.webkit.org/show_bug.cgi?id=109741
Reviewed by Sam Weinig.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::processWillOpenConnection):
(WebKit::StorageManager::processWillCloseConnection):
(WebKit::StorageManager::createStorageArea):
(WebKit::StorageManager::destroyStorageArea):
* UIProcess/Storage/StorageManager.h:
(StorageManager):
* UIProcess/Storage/StorageManager.messages.in:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (142780 => 142781)
--- trunk/Source/WebKit2/ChangeLog 2013-02-13 21:15:32 UTC (rev 142780)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-13 21:17:00 UTC (rev 142781)
@@ -1,5 +1,21 @@
2013-02-13 Anders Carlsson <[email protected]>
+ StorageManager should be a WorkQueueMessageReceiver
+ https://bugs.webkit.org/show_bug.cgi?id=109741
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::processWillOpenConnection):
+ (WebKit::StorageManager::processWillCloseConnection):
+ (WebKit::StorageManager::createStorageArea):
+ (WebKit::StorageManager::destroyStorageArea):
+ * UIProcess/Storage/StorageManager.h:
+ (StorageManager):
+ * UIProcess/Storage/StorageManager.messages.in:
+
+2013-02-13 Anders Carlsson <[email protected]>
+
EventDispatcher should be a WorkQueueMessageReceiver
https://bugs.webkit.org/show_bug.cgi?id=109736
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (142780 => 142781)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-02-13 21:15:32 UTC (rev 142780)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-02-13 21:17:00 UTC (rev 142781)
@@ -48,45 +48,22 @@
void StorageManager::processWillOpenConnection(WebProcessProxy* webProcessProxy)
{
- webProcessProxy->connection()->addQueueClient(this);
+ webProcessProxy->connection()->addWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName(), m_queue.get(), this);
}
void StorageManager::processWillCloseConnection(WebProcessProxy* webProcessProxy)
{
- webProcessProxy->connection()->removeQueueClient(this);
+ webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
}
-void StorageManager::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, OwnPtr<CoreIPC::MessageDecoder>& decoder)
+void StorageManager::createStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&)
{
- if (decoder->messageReceiverName() == Messages::StorageManager::messageReceiverName()) {
- // 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;
- }
-}
-
-void StorageManager::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
-{
-}
-
-void StorageManager::createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&)
-{
UNUSED_PARAM(storageAreaID);
UNUSED_PARAM(storageNamespaceID);
}
-void StorageManager::destroyStorageArea(CoreIPC::Connection*, uint64_t)
+void StorageManager::destroyStorageArea(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
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (142780 => 142781)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-02-13 21:15:32 UTC (rev 142780)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-02-13 21:17:00 UTC (rev 142781)
@@ -37,7 +37,7 @@
struct SecurityOriginData;
class WebProcessProxy;
-class StorageManager : public ThreadSafeRefCounted<StorageManager>, private CoreIPC::Connection::QueueClient {
+class StorageManager : public CoreIPC::Connection::WorkQueueMessageReceiver {
public:
static PassRefPtr<StorageManager> create();
~StorageManager();
@@ -48,18 +48,13 @@
private:
StorageManager();
- // CoreIPC::Connection::QueueClient
- virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&) OVERRIDE;
- virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
+ // CoreIPC::Connection::WorkQueueMessageReceiver.
+ virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- void didReceiveStorageManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&);
-
// Message handlers.
- void createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&);
- void destroyStorageArea(CoreIPC::Connection*, uint64_t storageAreaID);
+ void createStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&);
+ void destroyStorageArea(uint64_t storageAreaID);
- void dispatchMessageOnStorageManagerQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder*);
-
RefPtr<WorkQueue> m_queue;
};
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (142780 => 142781)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-02-13 21:15:32 UTC (rev 142780)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-02-13 21:17:00 UTC (rev 142781)
@@ -20,7 +20,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-messages -> StorageManager LegacyReceiver {
- CreateStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) DispatchOnConnectionQueue
- DestroyStorageArea(uint64_t storageAreaID) DispatchOnConnectionQueue
+messages -> StorageManager {
+ CreateStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData)
+ DestroyStorageArea(uint64_t storageAreaID)
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
