Changeset 86522 in webkit

Timestamp:

May 15, 2011 8:29:59 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-15 Anders Carlsson <​andersca@apple.com>

Reviewed by Maciej Stachowiak.

Pass the window NPObject identifier in the plug-in creation parameters
​https://bugs.webkit.org/show_bug.cgi?id=60865

This avoids a synchronous call when the plug-in wants to get the NPObject that
corresponds to the window.

• PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::initialize): Change this to take the PluginCreationParameters. Initialize the window NPObject.

(WebKit::PluginControllerProxy::windowScriptNPObject):
Just return the window NPObject; it's already been initialized.

• PluginProcess/PluginControllerProxy.h:
• PluginProcess/PluginCreationParameters.cpp: (WebKit::PluginCreationParameters::PluginCreationParameters): (WebKit::PluginCreationParameters::encode): (WebKit::PluginCreationParameters::decode):
• PluginProcess/PluginCreationParameters.h: Add the window NPObject ID.

• PluginProcess/WebProcessConnection.cpp: (WebKit::WebProcessConnection::createPlugin): Pass the creation parameters to PluginControllerProxy::initialize.

• WebProcess/Plugins/PluginProxy.cpp: (WebKit::PluginProxy::initialize): Initialize the window NPObject ID.

• WebProcess/Plugins/PluginProxy.messages.in: Remove the GetWindowScriptNPObject message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (3 diffs)
• PluginProcess/PluginControllerProxy.h (modified) (1 diff)
• PluginProcess/PluginCreationParameters.cpp (modified) (3 diffs)
• PluginProcess/PluginCreationParameters.h (modified) (1 diff)
• PluginProcess/WebProcessConnection.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginProxy.cpp (modified) (2 diffs)
• WebProcess/Plugins/PluginProxy.h (modified) (2 diffs)
• WebProcess/Plugins/PluginProxy.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Pass the window NPObject identifier in the plug-in creation parameters
+        https://bugs.webkit.org/show_bug.cgi?id=60865
+
+        This avoids a synchronous call when the plug-in wants to get the NPObject that
+        corresponds to the window.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::initialize):
+        Change this to take the PluginCreationParameters. Initialize the window NPObject.
+
+        (WebKit::PluginControllerProxy::windowScriptNPObject):
+        Just return the window NPObject; it's already been initialized.
+
+        * PluginProcess/PluginControllerProxy.h:
+        * PluginProcess/PluginCreationParameters.cpp:
+        (WebKit::PluginCreationParameters::PluginCreationParameters):
+        (WebKit::PluginCreationParameters::encode):
+        (WebKit::PluginCreationParameters::decode):
+        * PluginProcess/PluginCreationParameters.h:
+        Add the window NPObject ID.
+
+        * PluginProcess/WebProcessConnection.cpp:
+        (WebKit::WebProcessConnection::createPlugin):
+        Pass the creation parameters to PluginControllerProxy::initialize.
+
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::initialize):
+        Initialize the window NPObject ID.
+
+        * WebProcess/Plugins/PluginProxy.messages.in:
+        Remove the GetWindowScriptNPObject message.
+
 2011-05-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -86 +86 @@
 }
 
-bool PluginControllerProxy::initialize(const Plugin::Parameters& parameters)
+bool PluginControllerProxy::initialize(const PluginCreationParameters& creationParameters)
 {
     ASSERT(!m_plugin);
@@ -97 +97 @@
     }
 
-    if (!m_plugin->initialize(this, parameters)) {
+    m_windowNPObject = m_connection->npRemoteObjectMap()->createNPObjectProxy(creationParameters.windowNPObjectID, m_plugin.get());
+    ASSERT(m_windowNPObject);
+
+    if (!m_plugin->initialize(this, creationParameters.parameters)) {
         // Get the plug-in so we can pass it to removePluginControllerProxy. The pointer is only
         // used as an identifier so it's OK to just get a weak reference.
@@ -230 +233 @@
 NPObject* PluginControllerProxy::windowScriptNPObject()
 {
-    if (!m_windowNPObject) {
-        uint64_t windowScriptNPObjectID = 0;
-
-        if (!m_connection->connection()->sendSync(Messages::PluginProxy::GetWindowScriptNPObject(), Messages::PluginProxy::GetWindowScriptNPObject::Reply(windowScriptNPObjectID), m_pluginInstanceID))
-            return 0;
-
-        if (!windowScriptNPObjectID)
-            return 0;
-
-        m_windowNPObject = m_connection->npRemoteObjectMap()->createNPObjectProxy(windowScriptNPObjectID, m_plugin.get());
-        ASSERT(m_windowNPObject);
-    }
-
     retainNPObject(m_windowNPObject);
     return m_windowNPObject;

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -62 +62 @@
     uint64_t pluginInstanceID() const { return m_pluginInstanceID; }
 
-    bool initialize(const Plugin::Parameters&);
+    bool initialize(const PluginCreationParameters&);
     void destroy();
 

trunk/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp

@@ -35 +35 @@
 PluginCreationParameters::PluginCreationParameters()
     : pluginInstanceID(0)
+    , windowNPObjectID(0)
     , isPrivateBrowsingEnabled(false)
 #if USE(ACCELERATED_COMPOSITING)
@@ -45 +46 @@
 {
     encoder->encode(pluginInstanceID);
+    encoder->encode(windowNPObjectID);
     encoder->encode(parameters);
     encoder->encode(userAgent);
@@ -57 +59 @@
 {
     if (!decoder->decode(result.pluginInstanceID) || !result.pluginInstanceID)
+        return false;
+
+    if (!decoder->decode(result.windowNPObjectID))
         return false;
 

trunk/Source/WebKit2/PluginProcess/PluginCreationParameters.h

@@ -47 +47 @@
     uint64_t pluginInstanceID;
 
+    // The ID of the window NPObject.
+    uint64_t windowNPObjectID;
+
     // The parameters passed to the plug-in.
     Plugin::Parameters parameters;

trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

@@ -174 +174 @@
 
     // Now try to initialize the plug-in.
-    result = pluginControllerProxyPtr->initialize(creationParameters.parameters);
+    result = pluginControllerProxyPtr->initialize(creationParameters);
 
     if (!result)

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

@@ -102 +102 @@
     PluginCreationParameters creationParameters;
     creationParameters.pluginInstanceID = m_pluginInstanceID;
+    creationParameters.windowNPObjectID = windowNPObjectID();
     creationParameters.parameters = parameters;
     creationParameters.userAgent = pluginController->userAgent();
@@ -411 +412 @@
 }
 
-void PluginProxy::getWindowScriptNPObject(uint64_t& windowScriptNPObjectID)
+uint64_t PluginProxy::windowNPObjectID()
 {
     NPObject* windowScriptNPObject = m_pluginController->windowScriptNPObject();
-    if (!windowScriptNPObject) {
-        windowScriptNPObjectID = 0;
-        return;
-    }
-
-    windowScriptNPObjectID = m_connection->npRemoteObjectMap()->registerNPObject(windowScriptNPObject, this);
+    if (!windowScriptNPObject)
+        return 0;
+
+    uint64_t windowNPObjectID = m_connection->npRemoteObjectMap()->registerNPObject(windowScriptNPObject, this);
     releaseNPObject(windowScriptNPObject);
+
+    return windowNPObjectID;
 }
 

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

@@ -106 +106 @@
 
     bool needsBackingStore() const;
+    uint64_t windowNPObjectID();
 
     // Message handlers.
@@ -114 +115 @@
     void setCookiesForURL(const String& urlString, const String& cookieString);
     void getAuthenticationInfo(const WebCore::ProtectionSpace&, bool& returnValue, String& username, String& password);
-    void getWindowScriptNPObject(uint64_t& windowScriptNPObjectID);
     void getPluginElementNPObject(uint64_t& pluginElementNPObjectID);
     void evaluate(const NPVariantData& npObjectAsVariantData, const String& scriptString, bool allowPopups, bool& returnValue, NPVariantData& resultData);

trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in

@@ -42 +42 @@
     GetAuthenticationInfo(WebCore::ProtectionSpace protectionSpace) -> (bool returnValue, WTF::String username, WTF::String password)
 
-    # Gets a reference to the window NPObject.
-    GetWindowScriptNPObject() -> (uint64_t windowScriptNPObjectID)
-
     # Gets a reference to the plug-in element NPObject.
     GetPluginElementNPObject() -> (uint64_t pluginElementNPObjectID)