Changeset 143050 in webkit

Timestamp:

Feb 15, 2013 2:01:04 PM (11 years ago)

Author:

andersca@apple.com

Message:

Add a synchronous GetValues message to StorageManager
​https://bugs.webkit.org/show_bug.cgi?id=109968

Reviewed by Sam Weinig.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::dispatchWorkQueueMessageReceiverMessage):
Handle synchronous messages.

(CoreIPC::Connection::processIncomingMessage):
Check for work queue message receivers before doing any other processing.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::getValues):
Add empty stub.

• UIProcess/Storage/StorageManager.h:
• UIProcess/Storage/StorageManager.messages.in:

Add GetValues message.

• WebProcess/Storage/StorageAreaProxy.cpp:

(WebKit::StorageAreaProxy::loadValuesIfNeeded):
Send the GetValues message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (3 diffs)
• UIProcess/Storage/StorageManager.cpp (modified) (1 diff)
• UIProcess/Storage/StorageManager.h (modified) (2 diffs)
• UIProcess/Storage/StorageManager.messages.in (modified) (1 diff)
• WebProcess/Storage/StorageAreaProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-15  Anders Carlsson  <andersca@apple.com>
+
+        Add a synchronous GetValues message to StorageManager
+        https://bugs.webkit.org/show_bug.cgi?id=109968
+
+        Reviewed by Sam Weinig.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::dispatchWorkQueueMessageReceiverMessage):
+        Handle synchronous messages.
+
+        (CoreIPC::Connection::processIncomingMessage):
+        Check for work queue message receivers before doing any other processing.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::getValues):
+        Add empty stub.
+
+        * UIProcess/Storage/StorageManager.h:
+        * UIProcess/Storage/StorageManager.messages.in:
+        Add GetValues message.
+
+        * WebProcess/Storage/StorageAreaProxy.cpp:
+        (WebKit::StorageAreaProxy::loadValuesIfNeeded):
+        Send the GetValues message.
+
 2013-02-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -286 +286 @@
     OwnPtr<MessageDecoder> decoder = adoptPtr(incomingMessageDecoder);
 
-    // FIXME: Handle sync messages.
-    ASSERT(!decoder->isSyncMessage());
-
-    workQueueMessageReceiver->didReceiveMessage(this, *decoder);
+    if (!decoder->isSyncMessage()) {
+        workQueueMessageReceiver->didReceiveMessage(this, *decoder);
+        return;
+    }
+
+    uint64_t syncRequestID = 0;
+    if (!decoder->decode(syncRequestID) || !syncRequestID) {
+        // We received an invalid sync message.
+        // FIXME: Handle this.
+        decoder->markInvalid();
+        return;
+    }
+
+    OwnPtr<MessageEncoder> replyEncoder = MessageEncoder::create("IPC", "SyncMessageReply", syncRequestID);
+
+    // Hand off both the decoder and encoder to the work queue message receiver.
+    workQueueMessageReceiver->didReceiveSyncMessage(this, *decoder, replyEncoder);
+
+    // FIXME: If the message was invalid, we should send back a SyncMessageError.
+    ASSERT(!decoder->isInvalid());
+
+    if (replyEncoder)
+        sendSyncReply(replyEncoder.release());
 }
 
@@ -594 +613 @@
     }
 
+    // Check if any work queue message receivers are interested in this message.
+    HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver> > >::const_iterator it = m_workQueueMessageReceivers.find(message->messageReceiverName());
+    if (it != m_workQueueMessageReceivers.end()) {
+        it->value.first->dispatch(bind(&Connection::dispatchWorkQueueMessageReceiverMessage, this, it->value.second, message.release().leakPtr()));
+        return;
+    }
+
     // Check if this is a sync message or if it's a message that should be dispatched even when waiting for
     // a sync reply. If it is, and we're waiting for a sync reply this message needs to be dispatched.
@@ -614 +640 @@
     }
 
-    // Check if any work queue message receivers are interested in this message.
-    HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver> > >::const_iterator it = m_workQueueMessageReceivers.find(message->messageReceiverName());
-    if (it != m_workQueueMessageReceivers.end()) {
-        it->value.first->dispatch(bind(&Connection::dispatchWorkQueueMessageReceiverMessage, this, it->value.second, message.release().leakPtr()));
-        return;
-    }
-
     enqueueIncomingMessage(message.release());
 }

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -67 +67 @@
 }
 
+void StorageManager::getValues(uint64_t, HashMap<String, String>&)
+{
+    // FIXME: Implement this.
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h

@@ -30 +30 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/ThreadSafeRefCounted.h>
+#include <wtf/text/StringHash.h>
 
 class WorkQueue;
@@ -51 +52 @@
     // CoreIPC::Connection::WorkQueueMessageReceiver.
     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder) OVERRIDE;
 
     // Message handlers.
     void createStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&);
     void destroyStorageArea(uint64_t storageAreaID);
+    void getValues(uint64_t storageAreaID, HashMap<String, String>& values);
 
     RefPtr<WorkQueue> m_queue;

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in

@@ -24 +24 @@
     CreateStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData)
     DestroyStorageArea(uint64_t storageAreaID)
+
+    GetValues(uint64_t storageAreaID) -> (WTF::HashMap<WTF::String, WTF::String> values)
 }

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp

@@ -75 +75 @@
 
     loadValuesIfNeeded();
-
     return m_values->size();
 }
@@ -161 +160 @@
         return;
 
-    // FIXME: Actually load the values.
-    m_values = adoptPtr(new HashMap<String, String>());
+    HashMap<String, String> values;
+    // FIXME: This should use a special sendSync flag to indicate that we don't want to process incoming messages while waiting for a reply.
+    // (This flag does not yet exist).
+    WebProcess::shared().connection()->sendSync(Messages::StorageManager::GetValues(m_storageAreaID), Messages::StorageManager::GetValues::Reply(values), 0);
+
+    // FIXME: Don't copy the hash map.
+    m_values = adoptPtr(new HashMap<String, String>(values));
 }