Changeset 142540 in webkit

Timestamp:

Feb 11, 2013 4:08:15 PM (11 years ago)

Author:

andersca@apple.com

Message:

PluginProcessConnectionManager should be a QueueClient
​https://bugs.webkit.org/show_bug.cgi?id=109496

Reviewed by Andreas Kling.

• WebProcess/Plugins/PluginProcessConnectionManager.cpp:

(WebKit::PluginProcessConnectionManager::didReceiveMessageOnConnectionWorkQueue):
(WebKit):
(WebKit::PluginProcessConnectionManager::didCloseOnConnectionWorkQueue):

• WebProcess/Plugins/PluginProcessConnectionManager.h:

(PluginProcessConnectionManager):

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeConnection):

• WebProcess/WebProcess.h:

(WebProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnectionManager.cpp (modified) (2 diffs)
• WebProcess/Plugins/PluginProcessConnectionManager.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-11  Anders Carlsson  <andersca@apple.com>
+
+        PluginProcessConnectionManager should be a QueueClient
+        https://bugs.webkit.org/show_bug.cgi?id=109496
+
+        Reviewed by Andreas Kling.
+
+        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+        (WebKit::PluginProcessConnectionManager::didReceiveMessageOnConnectionWorkQueue):
+        (WebKit):
+        (WebKit::PluginProcessConnectionManager::didCloseOnConnectionWorkQueue):
+        * WebProcess/Plugins/PluginProcessConnectionManager.h:
+        (PluginProcessConnectionManager):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeConnection):
+        * WebProcess/WebProcess.h:
+        (WebProcess):
+
 2013-02-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp

@@ -32 +32 @@
 #include "ArgumentEncoder.h"
 #include "PluginProcessConnection.h"
+#include "PluginProcessConnectionManagerMessages.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
@@ -102 +103 @@
 }
 
+void PluginProcessConnectionManager::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, OwnPtr<CoreIPC::MessageDecoder>& decoder)
+{
+    if (decoder->messageReceiverName() == Messages::PluginProcessConnectionManager::messageReceiverName()) {
+        didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(ChildProcess::connection(), decoder);
+        return;
+    }
+}
+
+void PluginProcessConnectionManager::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
+}
+
 void PluginProcessConnectionManager::pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath, uint32_t opaquePluginType)
 {

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h

@@ -47 +47 @@
 class PluginProcessConnection;
         
-class PluginProcessConnectionManager {
+class PluginProcessConnectionManager : public CoreIPC::Connection::QueueClient {
     WTF_MAKE_NONCOPYABLE(PluginProcessConnectionManager);
 public:
@@ -59 +59 @@
 
 private:
+    // CoreIPC::Connection::QueueClient
+    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&) OVERRIDE;
+    virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
+
     // Called on the web process connection work queue.
     void pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath, uint32_t opaquePluginType);

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -31 +31 @@
 #include "InjectedBundleUserMessageCoders.h"
 #include "Logging.h"
-#include "PluginProcessConnectionManagerMessages.h"
 #include "StatisticsData.h"
 #include "WebApplicationCacheManager.h"
@@ -208 +207 @@
     connection->setShouldExitOnSyncMessageSendFailure(true);
     connection->addQueueClient(&m_eventDispatcher);
-    connection->addQueueClient(this);
+
+#if ENABLE(PLUGIN_PROCESS)
+    connection->addQueueClient(&m_pluginProcessConnectionManager);
+#endif
 
 #if USE(SECURITY_FRAMEWORK)

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -94 +94 @@
 #endif
 
-class WebProcess : public ChildProcess, private CoreIPC::Connection::QueueClient, private DownloadManager::Client {
+class WebProcess : public ChildProcess, private DownloadManager::Client {
 public:
     static WebProcess& shared();
@@ -265 +265 @@
     virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
 
-    // CoreIPC::Connection::QueueClient
-    virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&) OVERRIDE;
-    virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
-
     // Implemented in generated WebProcessMessageReceiver.cpp
     void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);