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.h | |
| 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.h')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 10a48f7..3d7ee9a 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -174,7 +174,6 @@ class CONTENT_EXPORT BrowserPlugin : virtual bool initialize(WebKit::WebPluginContainer* container) OVERRIDE; virtual void destroy() OVERRIDE; virtual NPObject* scriptableObject() OVERRIDE; - virtual struct _NPP* pluginNPP() OVERRIDE; virtual bool supportsKeyboardFocus() const OVERRIDE; virtual bool canProcessDrag() const OVERRIDE; virtual void paint( @@ -442,9 +441,6 @@ class CONTENT_EXPORT BrowserPlugin : bool compositing_enabled_; scoped_refptr<BrowserPluginCompositingHelper> compositing_helper_; - // Used to identify the plugin to WebBindings. - scoped_ptr<struct _NPP> npp_; - // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might // get called after BrowserPlugin has been destroyed. base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_; |