diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 21:10:44 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 21:10:44 +0000 |
| commit | 25e4bca816663d8cccc650e725e7c105390bf700 (patch) | |
| tree | 4cd11284f19184528a71425e1a813769872ed71b /webkit | |
| parent | 188d44296289a1fca5992915cb49d08587c5d606 (diff) | |
| download | chromium_src-25e4bca816663d8cccc650e725e7c105390bf700.zip chromium_src-25e4bca816663d8cccc650e725e7c105390bf700.tar.gz chromium_src-25e4bca816663d8cccc650e725e7c105390bf700.tar.bz2 | |
Update the Mac plugin whitelist/blacklist
Re-blacklist Move Networks player on Mac, and blacklist the crashing Quake Live plugin. Whitelist QuickTime now that it's mostly working and stable.
BUG=28298,25105,414047
TEST=Move Networks and Quake Live content should not load.
Review URL: http://codereview.chromium.org/414047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index e3f27c4..9bde55b 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -85,6 +85,8 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, const char* blacklisted_plugin_mimes[] = { "application/x-director", // Crashes during initialization. "application/x-googlegears", // Safari-specific. + "application/x-id-quakelive", // Crashes on load. + "application/x-vnd.movenetworks.qm", // Crashes on Snow Leopard. "application/vnd.o3d.auto", // Doesn't render, and having it // detected can prevent fallbacks. }; @@ -103,6 +105,7 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, "application/x-shockwave-flash", "application/x-silverlight", "application/x-webkit-test-netscape", + "video/quicktime", }; // Start with names. |