summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 18:13:16 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 18:13:16 +0000
commit934f64699934345bac4a2e83747889dbb978f580 (patch)
tree108a926c4afbec476e753c01883b7d5d75ce7f65 /webkit/glue
parent16235a13626aa7f7d4ac7dafaf65e3dd3725fa2f (diff)
downloadchromium_src-934f64699934345bac4a2e83747889dbb978f580.zip
chromium_src-934f64699934345bac4a2e83747889dbb978f580.tar.gz
chromium_src-934f64699934345bac4a2e83747889dbb978f580.tar.bz2
Don't unload RealPlayer in the plugin process on the Mac
BUG=36803 TEST=none Review URL: http://codereview.chromium.org/661086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl_mac.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index 7fc4376..36acd8b 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -217,8 +217,9 @@ void WebPluginDelegateImpl::PlatformInitialize() {
// destroyPlugin in WebNetscapePluginView.mm, for examples).
quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
- // Silverlight doesn't always unload cleanly, so don't unload it at shutdown.
- if (instance()->mime_type().find("x-silverlight") != std::string::npos)
+ // 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();
#ifndef NP_NO_CARBON