diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 05:46:22 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 05:46:22 +0000 |
| commit | 4bc2d022d22a0bbd20e48cb7d91cbabc7972a11c (patch) | |
| tree | 91a6fe68714a29291f933babb489e6a732ae68ca /content/renderer/browser_plugin/browser_plugin_bindings.cc | |
| parent | 97cc1774d5cf2590588187f886e306ebacf2870f (diff) | |
| download | chromium_src-4bc2d022d22a0bbd20e48cb7d91cbabc7972a11c.zip chromium_src-4bc2d022d22a0bbd20e48cb7d91cbabc7972a11c.tar.gz chromium_src-4bc2d022d22a0bbd20e48cb7d91cbabc7972a11c.tar.bz2 | |
Revert 202364 "Track NPObject ownership by the originating plugi..."
Suspected to have broken ClickToPlayPluginTest.NoCallbackAtLoad
> Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome)
>
> This CL updates Chrome to return plugin NPP identifiers for NPAPI, PPAPI and browser plugins, and to make the necessary calls into Blink to support object ownership tracking.
>
> This CL requires Blink CL crrev.com/14989014, and is itself required by Blink CL crrev.com/14019005.
>
> BUG=152006
>
> Review URL: https://chromiumcodereview.appspot.com/15007012
TBR=wez@chromium.org
Review URL: https://codereview.chromium.org/15757007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/browser_plugin/browser_plugin_bindings.cc')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin_bindings.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc index 7857ed5..9ded3f9 100644 --- a/content/renderer/browser_plugin/browser_plugin_bindings.cc +++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc @@ -817,8 +817,7 @@ BrowserPluginBindings::BrowserPluginBindings(BrowserPlugin* instance) np_object_(NULL), weak_ptr_factory_(this) { NPObject* obj = - WebBindings::createObject(instance->pluginNPP(), - &browser_plugin_message_class); + WebBindings::createObject(NULL, &browser_plugin_message_class); np_object_ = static_cast<BrowserPluginBindings::BrowserPluginNPObject*>(obj); np_object_->message_channel = weak_ptr_factory_.GetWeakPtr(); |