diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 18:25:37 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 18:25:37 +0000 |
| commit | ec11eecbb5577322bc1c621474a9110d395db2e8 (patch) | |
| tree | a4d478ec300bd62552c8b3b9504529b4786e175c /webkit/glue | |
| parent | 97c128393bbd343cb166690da99920b2ca1b7b52 (diff) | |
| download | chromium_src-ec11eecbb5577322bc1c621474a9110d395db2e8.zip chromium_src-ec11eecbb5577322bc1c621474a9110d395db2e8.tar.gz chromium_src-ec11eecbb5577322bc1c621474a9110d395db2e8.tar.bz2 | |
Revert 31562 - Add NPP_SetWindow() with a NULL window to stop races in plugin
shutdown until a revised version of 372025 lands.
BUG=25694
TEST=Quicktime plugin should no longer crash when pages close
Review URL: http://codereview.chromium.org/383006
TBR=amanda@chromium.org
Review URL: http://codereview.chromium.org/387006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_mac.mm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 077327c..9e7c90e 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -201,12 +201,6 @@ void WebPluginDelegateImpl::DestroyInstance() { // this before calling set_web_plugin(NULL) because the // instance uses the helper to do the download. instance_->CloseStreams(); - - window_.window = NULL; - if (!(quirks_ & PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY)) { - instance_->NPP_SetWindow(&window_); - } - instance_->NPP_Destroy(); instance_->set_web_plugin(NULL); instance_ = 0; |