Changeset 86577 in webkit

Timestamp:

May 16, 2011 9:06:07 AM (13 years ago)

Author:

andersca@apple.com

Message:

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

Reviewed by Adam Roben.

Add a returnValue parameter to tryToShortCircuitInvoke
​https://bugs.webkit.org/show_bug.cgi?id=60891

tryToShortCircuitInvoke needs to be able to indicate that an invoke
call failed. Add a returnValue parameter and have the real return value
indicate whether tryToShortCircuitInvoke did short-circuit the invoke or not.

• PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::tryToShortCircuitInvoke):
• PluginProcess/PluginControllerProxy.h:
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: (WebKit::NPN_Invoke):
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp: (WebKit::NetscapePlugin::tryToShortCircuitInvoke):
• WebProcess/Plugins/Netscape/NetscapePlugin.h:
• WebProcess/Plugins/PluginController.h:
• WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::tryToShortCircuitInvoke):
• WebProcess/Plugins/PluginView.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (1 diff)
• PluginProcess/PluginControllerProxy.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (1 diff)
• WebProcess/Plugins/PluginController.h (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add a returnValue parameter to tryToShortCircuitInvoke
+        https://bugs.webkit.org/show_bug.cgi?id=60891
+
+        tryToShortCircuitInvoke needs to be able to indicate that an invoke
+        call failed. Add a returnValue parameter and have the real return value
+        indicate whether tryToShortCircuitInvoke did short-circuit the invoke or not.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::tryToShortCircuitInvoke):
+        * PluginProcess/PluginControllerProxy.h:
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_Invoke):
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::tryToShortCircuitInvoke):
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        * WebProcess/Plugins/PluginController.h:
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::tryToShortCircuitInvoke):
+        * WebProcess/Plugins/PluginView.h:
+
 2011-05-16  Siddharth Mathur  <siddharth.mathur@nokia.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -282 +282 @@
 }
 
-bool PluginControllerProxy::tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
+bool PluginControllerProxy::tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result)
 {
     return false;

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -90 +90 @@
     virtual NPObject* pluginElementNPObject();
     virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups);
-    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);
+    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result);
     virtual void setStatusbarText(const String&);
     virtual bool isAcceleratedCompositingEnabled();

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -660 +660 @@
 {
     if (RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp)) {
-        if (plugin->tryToShortCircuitInvoke(npObject, methodName, arguments, argumentCount, result))
-            return true;
+        bool returnValue;
+        if (plugin->tryToShortCircuitInvoke(npObject, methodName, arguments, argumentCount, returnValue, *result))
+            return returnValue;
     }
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -238 +238 @@
 }
 
-bool NetscapePlugin::tryToShortCircuitInvoke(NPObject* npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
-{
-    return m_pluginController->tryToShortCircuitInvoke(npObject, methodName, arguments, argumentCount, result);
+bool NetscapePlugin::tryToShortCircuitInvoke(NPObject* npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result)
+{
+    return m_pluginController->tryToShortCircuitInvoke(npObject, methodName, arguments, argumentCount, returnValue, result);
 }
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -90 +90 @@
     NPObject* pluginElementNPObject();
 
-    bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);
+    bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result);
 
     void cancelStreamLoad(NetscapePluginStream*);

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

@@ -83 +83 @@
 
     // Tries to short circuit the NPN_Invoke call with the given parameters. Returns true on success.
-    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result) = 0;
+    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result) = 0;
 
     // Set the statusbar text.

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

@@ -992 +992 @@
 }
 
-bool PluginView::tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
+bool PluginView::tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result)
 {
     // Never try to short-circuit invoke in the web process.

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

@@ -131 +131 @@
     virtual NPObject* pluginElementNPObject();
     virtual bool evaluate(NPObject*, const String&scriptString, NPVariant* result, bool allowPopups);
-    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);
+    virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result);
     virtual void setStatusbarText(const String&);
     virtual bool isAcceleratedCompositingEnabled();