summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 18:09:01 +0000
committerstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 18:09:01 +0000
commit199ed63f28098561badf54c521282f1c43ca91a6 (patch)
tree26f91a9b3b6d72e8a0895e398bbbdaee213f8a04 /webkit/glue
parentd2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e (diff)
downloadchromium_src-199ed63f28098561badf54c521282f1c43ca91a6.zip
chromium_src-199ed63f28098561badf54c521282f1c43ca91a6.tar.gz
chromium_src-199ed63f28098561badf54c521282f1c43ca91a6.tar.bz2
Blacklist the Gears plugin on Mac
BUG=18988 TEST=None, since this is currently redundant with the plugin whitelist Review URL: http://codereview.chromium.org/164487 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm7
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index 46cb118..5e8d250 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -67,6 +67,13 @@ void PluginList::LoadPluginsFromDir(const FilePath &path) {
}
bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
+ // The Gears plugin is Safari-specific, and causes crashes, so don't load it.
+ for (std::vector<WebPluginMimeType>::const_iterator i =
+ info.mime_types.begin(); i != info.mime_types.end(); ++i) {
+ if (i->mime_type == "application/x-googlegears")
+ return false;
+ }
+
// For now, only load plugins that we know are working reasonably well.
// Anything using QuickDraw-based drawing, for example, would crash
// immediately.