diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 02:21:28 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 02:21:28 +0000 |
| commit | 5a49a6a8b770c1736872028caf20348fa214b520 (patch) | |
| tree | 30f95380ae6ac7572eb1a9084f64daa2885e2dcf | |
| parent | 274fadfd8787d784930a93d3e8642dc2bc186b4c (diff) | |
| download | chromium_src-5a49a6a8b770c1736872028caf20348fa214b520.zip chromium_src-5a49a6a8b770c1736872028caf20348fa214b520.tar.gz chromium_src-5a49a6a8b770c1736872028caf20348fa214b520.tar.bz2 | |
Only clear script objects during PPAPI WebPluginImpl teardown if it was initialized.
BUG=244572,152006
Review URL: https://chromiumcodereview.appspot.com/16023019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202747 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_webplugin_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc index 4ce9527..f03b0cd 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc @@ -120,7 +120,8 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) { void WebPluginImpl::destroy() { // Tell |container_| to clear references to this plugin's script objects. - container_->clearScriptObjects(); + if (container_) + container_->clearScriptObjects(); if (instance_) { ::ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_); |