summaryrefslogtreecommitdiffstats
path: root/chrome/plugin/npobject_proxy.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:09:34 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:09:34 +0000
commit9aeaa120c0f6e3ad1251e8c29c115667de9b5058 (patch)
tree15d1b8545d7d65132bfe0d168911ebf7b3c99e5e /chrome/plugin/npobject_proxy.cc
parent9da35d991a087e00a5043b33714b46e97282adaf (diff)
downloadchromium_src-9aeaa120c0f6e3ad1251e8c29c115667de9b5058.zip
chromium_src-9aeaa120c0f6e3ad1251e8c29c115667de9b5058.tar.gz
chromium_src-9aeaa120c0f6e3ad1251e8c29c115667de9b5058.tar.bz2
Invoke the right method (invokeDefault) if a plugin calls NPN_InvokeDefault on its own object.
BUG=5110 Review URL: http://codereview.chromium.org/282010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/npobject_proxy.cc')
-rw-r--r--chrome/plugin/npobject_proxy.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc
index 492c6c8..8071141 100644
--- a/chrome/plugin/npobject_proxy.cc
+++ b/chrome/plugin/npobject_proxy.cc
@@ -156,7 +156,11 @@ bool NPObjectProxy::NPInvokePrivate(NPP npp,
NPObjectProxy* proxy = GetProxy(obj);
if (!proxy) {
- return obj->_class->invoke(obj, name, args, arg_count, np_result);
+ if (is_default) {
+ return obj->_class->invokeDefault(obj, args, arg_count, np_result);
+ } else {
+ return obj->_class->invoke(obj, name, args, arg_count, np_result);
+ }
}
bool result = false;