diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 16:11:49 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 16:11:49 +0000 |
| commit | 42ed07c83974dad37006484c4a9fc466572b4a60 (patch) | |
| tree | d4acc92b1ef0cf3e4f4b6d66e3a98312bcc30045 /webkit | |
| parent | bc2aeca0f0acb9de5c5c5e969f911b7e15a0febd (diff) | |
| download | chromium_src-42ed07c83974dad37006484c4a9fc466572b4a60.zip chromium_src-42ed07c83974dad37006484c4a9fc466572b4a60.tar.gz chromium_src-42ed07c83974dad37006484c4a9fc466572b4a60.tar.bz2 | |
Never unload plugins from the plugin process on the Mac
This has happened to enough plugins now that it seems better to just make it a blanket policy on the Mac. We don't gain anything by unloading them at shutdown.
BUG=41431
TEST=Internal Flash shouldn't crash on unload.
Review URL: http://codereview.chromium.org/1652003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_mac.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 6f2d4ec..77aae29 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -225,10 +225,9 @@ bool WebPluginDelegateImpl::PlatformInitialize() { // destroyPlugin in WebNetscapePluginView.mm, for examples). quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY; - // Some plugins don't always unload cleanly, so don't unload them at shutdown. - if (instance()->mime_type().find("x-silverlight") != std::string::npos || - instance()->mime_type().find("audio/x-pn-realaudio") != std::string::npos) - instance()->plugin_lib()->PreventLibraryUnload(); + // Mac plugins don't expect to be unloaded, and they don't always do so + // cleanly, so don't unload them at shutdown. + instance()->plugin_lib()->PreventLibraryUnload(); #ifndef NP_NO_QUICKDRAW if (instance()->drawing_model() == NPDrawingModelQuickDraw) { |