summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 21:58:10 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 21:58:10 +0000
commitd3852e4df8dc6b7cfe04708d8d43e6b11448838d (patch)
treefae0bad8976cb8c0675b6422fcd54c02100551df /webkit
parent969243f80d1e1052bb6f69571664eed9f0cec7fe (diff)
downloadchromium_src-d3852e4df8dc6b7cfe04708d8d43e6b11448838d.zip
chromium_src-d3852e4df8dc6b7cfe04708d8d43e6b11448838d.tar.gz
chromium_src-d3852e4df8dc6b7cfe04708d8d43e6b11448838d.tar.bz2
Update the Mac plugin whitelist/blacklist for recent fixes
Remove Move Networks plugin from the blacklist, now that it doesn't crash, and add Silverlight to the whitelist. BUG=25105,27788 TEST=Move Networks content should load (although it only plays audio) Review URL: http://codereview.chromium.org/385143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index f37f441..e3f27c4 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -85,7 +85,6 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
const char* blacklisted_plugin_mimes[] = {
"application/x-director", // Crashes during initialization.
"application/x-googlegears", // Safari-specific.
- "application/x-vnd.movenetworks.qm", // Crashes during initialization.
"application/vnd.o3d.auto", // Doesn't render, and having it
// detected can prevent fallbacks.
};
@@ -102,6 +101,7 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
"application/googletalk",
"application/x-picasa-detect",
"application/x-shockwave-flash",
+ "application/x-silverlight",
"application/x-webkit-test-netscape",
};