[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ed5de104987fb57242fa41ae674066bf44a20c1f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 19:37:25 2010 +0000

    Rename GetPluginHostConnection to GetPluginPath
    https://bugs.webkit.org/show_bug.cgi?id=46292
    
    Reviewed by Adam Roben.
    
    Rename GetPluginHostConnection to GetPluginPath since this message will always get the
    plug-in path. We'll add another message to actually get the connection.
    
    * Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h:
    * UIProcess/WebProcessProxy.cpp:
    (WebKit::WebProcessProxy::getPluginPath):
    (WebKit::WebProcessProxy::didReceiveMessage):
    (WebKit::WebProcessProxy::didReceiveSyncMessage):
    * UIProcess/WebProcessProxy.h:
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f3d2e5e..a6d5213 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,25 @@
 
         Reviewed by Adam Roben.
 
+        Rename GetPluginHostConnection to GetPluginPath
+        https://bugs.webkit.org/show_bug.cgi?id=46292
+
+        Rename GetPluginHostConnection to GetPluginPath since this message will always get the
+        plug-in path. We'll add another message to actually get the connection.
+
+        * Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getPluginPath):
+        (WebKit::WebProcessProxy::didReceiveMessage):
+        (WebKit::WebProcessProxy::didReceiveSyncMessage):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::createPlugin):
+
+2010-09-22  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
         Move plug-in creation to WebPage::createPlugin
         https://bugs.webkit.org/show_bug.cgi?id=46289
 
diff --git a/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h b/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h
index 3b8e3c4..5d04802 100644
--- a/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h
+++ b/WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h
@@ -40,7 +40,7 @@ enum Kind {
     DidPerformServerRedirect,
     DidUpdateHistoryTitle,
     DidDestroyFrame,
-    GetPluginHostConnection,
+    GetPluginPath,
     GetPlugins
 };
 
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index a02426c..231ac7d 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -205,7 +205,7 @@ void WebProcessProxy::getPlugins(bool refresh, Vector<PluginInfo>& plugins)
     m_context->pluginInfoStore()->getPlugins(plugins);
 }
 
-void WebProcessProxy::getPluginHostConnection(const String& mimeType, const KURL& url, String& pluginPath)
+void WebProcessProxy::getPluginPath(const String& mimeType, const KURL& url, String& pluginPath)
 {
     String newMimeType = mimeType.lower();
 
@@ -315,7 +315,7 @@ void WebProcessProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC
 
             // These are synchronous messages and should never be handled here.
             case WebProcessProxyMessage::GetPlugins:
-            case WebProcessProxyMessage::GetPluginHostConnection:
+            case WebProcessProxyMessage::GetPluginPath:
                 ASSERT_NOT_REACHED();
                 break;
         }
@@ -354,7 +354,7 @@ CoreIPC::SyncReplyMode WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connectio
                 return CoreIPC::AutomaticReply;
             }
 
-            case WebProcessProxyMessage::GetPluginHostConnection: {
+            case WebProcessProxyMessage::GetPluginPath: {
                 String mimeType;
                 String urlString;
                 
@@ -362,7 +362,7 @@ CoreIPC::SyncReplyMode WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connectio
                     return CoreIPC::AutomaticReply;
                 
                 String pluginPath;
-                getPluginHostConnection(mimeType, KURL(ParsedURLString, urlString), pluginPath);
+                getPluginPath(mimeType, KURL(ParsedURLString, urlString), pluginPath);
                 reply->encode(CoreIPC::In(pluginPath));
                 return CoreIPC::AutomaticReply;
             }
diff --git a/WebKit2/UIProcess/WebProcessProxy.h b/WebKit2/UIProcess/WebProcessProxy.h
index 43e966a..356d6a1 100644
--- a/WebKit2/UIProcess/WebProcessProxy.h
+++ b/WebKit2/UIProcess/WebProcessProxy.h
@@ -105,7 +105,7 @@ private:
     bool sendMessage(CoreIPC::MessageID, PassOwnPtr<CoreIPC::ArgumentEncoder>);
 
     void getPlugins(bool refresh, Vector<WebCore::PluginInfo>&);
-    void getPluginHostConnection(const String& mimeType, const WebCore::KURL& url, String& pluginPath);
+    void getPluginPath(const String& mimeType, const WebCore::KURL& url, String& pluginPath);
 
     void addOrUpdateBackForwardListItem(uint64_t itemID, const String& originalURLString, const String& urlString, const String& title);
     void addVisitedLink(WebCore::LinkHash);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 286cdab..9344e0f 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -174,9 +174,7 @@ PassRefPtr<Plugin> WebPage::createPlugin(const Plugin::Parameters& parameters)
 {
     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, 
+    if (!WebProcess::shared().connection()->sendSync(WebProcessProxyMessage::GetPluginPath, 0, 
                                                      CoreIPC::In(parameters.mimeType, parameters.url.string()), 
                                                      CoreIPC::Out(pluginPath), 
                                                      CoreIPC::Connection::NoTimeout))

-- 
WebKit Debian packaging