| Index: content/renderer/browser_plugin/browser_plugin.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
|
| index c0a2e8a96c5be93804bfffb2fcaf05474c9bf8fe..1be227deac4342edf795619bd3b5ecf4db3043b1 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin.cc
|
| @@ -435,12 +435,13 @@ 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_)
|
| + 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_);
|
| + // 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_);
|
| + }
|
|
|
| if (compositing_helper_.get())
|
| compositing_helper_->OnContainerDestroy();
|
|
|