diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 16:33:46 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 16:33:46 +0000 |
| commit | 9e50b3815f705035dc2dbdff2ba52d4e23fbe192 (patch) | |
| tree | 7ddd3523a48cef61eb2b10bd47ce6268d55d3dff /webkit | |
| parent | 60c3563371d98c2ffc072e4cfedad60abee84367 (diff) | |
| download | chromium_src-9e50b3815f705035dc2dbdff2ba52d4e23fbe192.zip chromium_src-9e50b3815f705035dc2dbdff2ba52d4e23fbe192.tar.gz chromium_src-9e50b3815f705035dc2dbdff2ba52d4e23fbe192.tar.bz2 | |
Blacklist some non-functional plugins on the Mac
Since these plugins don't work in Safari on 10.6 either, there's no real value in letting them try to load.
BUG=25105,20635,25104
TEST=Install Shockwave for Director or the MoveNetworks media player plugin, and visit a site with that content. The page should load, but with the plugin content missing.
Review URL: http://codereview.chromium.org/292022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index 4e8c055..b6c4a60 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -69,11 +69,17 @@ void PluginList::LoadPluginsFromDir(const FilePath &path, bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, std::vector<WebPluginInfo>* plugins) { - // The Gears plugin is Safari-specific, and causes crashes, so don't load it. + // Screen out some plugins that we know don't work at all. for (std::vector<WebPluginMimeType>::const_iterator i = info.mime_types.begin(); i != info.mime_types.end(); ++i) { - if (i->mime_type == "application/x-googlegears") + // The Gears plugin is Safari-specific. MoveNetworks Quantum Media Player + // and Shockwave for Director crash during initialization, and don't work in + // Safari on 10.6 either. + if (i->mime_type == "application/x-googlegears" || + i->mime_type == "application/x-vnd.movenetworks.qm" || + i->mime_type == "application/x-director") { return false; + } } // Hierarchy check |