Changeset 62824 in webkit

Timestamp:

Jul 8, 2010 1:14:46 PM (14 years ago)

Author:

andersca@apple.com

Message:

Add a GetPluginHostConnection WebProcessProxy message
​https://bugs.webkit.org/show_bug.cgi?id=41893

Reviewed by Sam Weinig.

• Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h:

(WebProcessProxyMessage::):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::getPluginHostConnection):
(WebKit::WebProcessProxy::didReceiveMessage):
(WebKit::WebProcessProxy::didReceiveSyncMessage):

• UIProcess/WebProcessProxy.h:
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createPlugin):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (4 diffs)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-08  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add a GetPluginHostConnection WebProcessProxy message
+        https://bugs.webkit.org/show_bug.cgi?id=41893
+        
+        * Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h:
+        (WebProcessProxyMessage::):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getPluginHostConnection):
+        (WebKit::WebProcessProxy::didReceiveMessage):
+        (WebKit::WebProcessProxy::didReceiveSyncMessage):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin):
+
 2010-07-08  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h

@@ -35 +35 @@
 enum Kind {
     PostMessage,
-    GetPlugins
+    GetPlugins,
+    GetPluginHostConnection
 };
 

trunk/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -34 +34 @@
 #include "WebProcessMessageKinds.h"
 #include "WebProcessProxyMessageKinds.h"
+#include <WebCore/KURL.h>
 #include <WebCore/PlatformString.h>
 
@@ -166 +167 @@
         PluginInfoStore::shared().refresh();
     PluginInfoStore::shared().getPlugins(plugins);
+}
+
+void WebProcessProxy::getPluginHostConnection(const String& mimeType, const KURL& url, WebCore::String& pluginPath)
+{
+    String newMimeType = mimeType.lower();
+
+    PluginInfoStore::Plugin plugin = PluginInfoStore::shared().findPlugin(newMimeType, url);
+    if (!plugin.path)
+        return;
+
+    pluginPath = plugin.path;
 }
 
@@ -183 +195 @@
             // These are synchronous messages and should never be handled here.
             case WebProcessProxyMessage::GetPlugins:
+            case WebProcessProxyMessage::GetPluginHostConnection:
                 ASSERT_NOT_REACHED();
                 break;
@@ -216 +229 @@
             }
 
+            case WebProcessProxyMessage::GetPluginHostConnection: {
+#if PLATFORM(MAC)
+                String mimeType;
+                String urlString;
+                
+                if (!arguments->decode(CoreIPC::Out(mimeType, urlString)))
+                    return;
+                
+                String pluginPath;
+                getPluginHostConnection(mimeType, KURL(ParsedURLString, urlString), pluginPath);
+                reply->encode(CoreIPC::In(pluginPath));
+#endif
+                break;
+            }
+
             // These are asynchronous messages and should never be handled here.
             case WebProcessProxyMessage::PostMessage:

trunk/WebKit2/UIProcess/WebProcessProxy.h

@@ -38 +38 @@
 
 namespace WebCore {
+    class KURL;
     class String;
 };
@@ -93 +94 @@
     void forwardMessageToWebContext(const WebCore::String&);
     void getPlugins(bool refresh, Vector<WebCore::PluginInfo>&);
-    
+    void getPluginHostConnection(const WebCore::String& mimeType, const WebCore::KURL& url, WebCore::String& pluginPath);
+
     // CoreIPC::Connection::Client
     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);

trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -35 +35 @@
 #include "WebPage.h"
 #include "WebPageProxyMessageKinds.h"
+#include "WebProcessProxyMessageKinds.h"
 #include "WebProcess.h"
 #include <JavaScriptCore/APICast.h>
@@ -767 +768 @@
 PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement*, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
-    notImplemented();
-    
+    String pluginPath;
+
+    // FIXME: In the future, this should return a real CoreIPC connection to the plug-in host, but for now we just
+    // return the path and load the plug-in in the web process.
+    if (!WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPluginHostConnection, 0, 
+                                                     CoreIPC::In(mimeType, url.string()), 
+                                                     CoreIPC::Out(pluginPath), 
+                                                     CoreIPC::Connection::NoTimeout))
+        return 0;
+
+    if (pluginPath.isNull())
+        return 0;
+
+    // FIXME: Use the plug-in path.
+
     RefPtr<Plugin> plugin = DummyPlugin::create();
     if (!plugin->initialize(url, paramNames, paramValues, mimeType, loadManually))