Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: trunk/src/content/renderer/browser_plugin/browser_plugin.cc

Issue 15757007: Revert 202364 "Track NPObject ownership by the originating plugi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/renderer/browser_plugin/browser_plugin.cc
===================================================================
--- trunk/src/content/renderer/browser_plugin/browser_plugin.cc (revision 202368)
+++ trunk/src/content/renderer/browser_plugin/browser_plugin.cc (working copy)
@@ -1138,10 +1138,6 @@
if (!GetContentClient()->renderer()->AllowBrowserPlugin(container))
return false;
- // Tell |container| to allow this plugin to use script objects.
- npp_.reset(new NPP_t);
- container->allowScriptObjects();
-
bindings_.reset(new BrowserPluginBindings(this));
container_ = container;
container_->setWantsWheelEvents(true);
@@ -1185,12 +1181,6 @@
}
void BrowserPlugin::destroy() {
- // If the plugin was initialized then it has a valid |npp_| identifier, and
- // the |container_| must clear references to the plugin's script objects.
- DCHECK(!npp_ || container_);
- if (container_)
- container_->clearScriptObjects();
-
// The BrowserPlugin's WebPluginContainer is deleted immediately after this
// call returns, so let's not keep a reference to it around.
g_plugin_container_map.Get().erase(container_);
@@ -1213,10 +1203,6 @@
return browser_plugin_np_object;
}
-NPP BrowserPlugin::pluginNPP() {
- return npp_.get();
-}
-
bool BrowserPlugin::supportsKeyboardFocus() const {
return true;
}

Powered by Google App Engine
This is Rietveld 408576698