diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 03:20:48 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 03:20:48 +0000 |
| commit | e2cc7d4f7efde5ee4351af5ce5e92035d52941e0 (patch) | |
| tree | a05199d17fb1dee55fe8c6d26717303141ea1eeb /chrome/plugin | |
| parent | a5bc2ab22a6772684276b5e3a443f94f251485b1 (diff) | |
| download | chromium_src-e2cc7d4f7efde5ee4351af5ce5e92035d52941e0.zip chromium_src-e2cc7d4f7efde5ee4351af5ce5e92035d52941e0.tar.gz chromium_src-e2cc7d4f7efde5ee4351af5ce5e92035d52941e0.tar.bz2 | |
Revert r3074 due to Mac build bustage
Review URL: http://codereview.chromium.org/6378
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/npobject_proxy.cc | 10 | ||||
| -rw-r--r-- | chrome/plugin/npobject_stub.cc | 4 | ||||
| -rw-r--r-- | chrome/plugin/npobject_stub.h | 3 |
3 files changed, 2 insertions, 15 deletions
diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 9acde3d..1b464e0 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -324,22 +324,12 @@ bool NPObjectProxy::NPNEvaluate(NPP npp, return false; } - bool popups_allowed = false; - - if (npp) { - NPAPI::PluginInstance* plugin_instance = - reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata); - if (plugin_instance) - popups_allowed = plugin_instance->popups_allowed(); - } - NPVariant_Param result_param; std::string script_str = std::string( script->UTF8Characters, script->UTF8Length); NPObjectMsg_Evaluate* msg = new NPObjectMsg_Evaluate(proxy->route_id(), script_str, - popups_allowed, &result_param, &result); diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index ec276b0..80f6356 100644 --- a/chrome/plugin/npobject_stub.cc +++ b/chrome/plugin/npobject_stub.cc @@ -260,7 +260,6 @@ void NPObjectStub::OnEnumeration(std::vector<NPIdentifier_Param>* value, } void NPObjectStub::OnEvaluate(const std::string& script, - bool popups_allowed, IPC::Message* reply_msg) { if (IsPluginProcess()) { NOTREACHED() << "Should only be called on NPObjects in the renderer"; @@ -278,8 +277,7 @@ void NPObjectStub::OnEvaluate(const std::string& script, script_string.UTF8Characters = script.c_str(); script_string.UTF8Length = static_cast<unsigned int>(script.length()); - bool return_value = NPN_EvaluateHelper(0, popups_allowed, npobject_, - &script_string, &result_var); + bool return_value = NPN_Evaluate(0, npobject_, &script_string, &result_var); NPVariant_Param result_param; CreateNPVariantParam(result_var, local_channel, &result_param, true); diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h index a309750..e5f1743 100644 --- a/chrome/plugin/npobject_stub.h +++ b/chrome/plugin/npobject_stub.h @@ -63,8 +63,7 @@ class NPObjectStub : public IPC::Channel::Listener, void OnInvalidate(); void OnEnumeration(std::vector<NPIdentifier_Param>* value, bool* result); - void OnEvaluate(const std::string& script, bool popups_allowed, - IPC::Message* reply_msg); + void OnEvaluate(const std::string& script, IPC::Message* reply_msg); void OnSetException(const std::string& message); private: |