diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 19:43:22 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 19:43:22 +0000 |
| commit | 2b4bfd5f91f8c1543114546bb306ab3db322356e (patch) | |
| tree | c1e8e146cf55e7e6bdd9b2337e6f28018e45243c /webkit/glue/plugins/plugin_lib_mac.mm | |
| parent | 9536018ab8d6b01ccbd3d769fff5c41a2b4f791b (diff) | |
| download | chromium_src-2b4bfd5f91f8c1543114546bb306ab3db322356e.zip chromium_src-2b4bfd5f91f8c1543114546bb306ab3db322356e.tar.gz chromium_src-2b4bfd5f91f8c1543114546bb306ab3db322356e.tar.bz2 | |
Prevent plugins from handling PDF on the Mac
Strip application/pdf from handled MIME types when loading plugins until we have a PDF-handling plugin working enough to be better than just downloading the file.
BUG=26075
TEST=Open a PDF on 10.6; it should be downloaded rather than showing the first page inline.
Review URL: http://codereview.chromium.org/384010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_lib_mac.mm')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib_mac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm index d0e2cd5..d4c93f4 100644 --- a/webkit/glue/plugins/plugin_lib_mac.mm +++ b/webkit/glue/plugins/plugin_lib_mac.mm @@ -88,6 +88,10 @@ bool ReadPlistPluginInfo(const FilePath& filename, CFBundleRef bundle, WebPluginMimeType mime; mime.mime_type = base::SysNSStringToUTF8([mime_type lowercaseString]); +#ifndef OS_MACOSX_ALLOW_PDF_LOADING + if (mime.mime_type == "application/pdf") + continue; +#endif if (mime_desc) mime.description = base::SysNSStringToWide(mime_desc); for (NSString* ext in mime_exts) @@ -188,6 +192,10 @@ bool ReadSTRPluginInfo(const FilePath& filename, CFBundleRef bundle, for (size_t i = 0; i < num_types; ++i) { WebPluginMimeType mime; mime.mime_type = StringToLowerASCII(type_strings[2*i]); +#ifndef OS_MACOSX_ALLOW_PDF_LOADING + if (mime.mime_type == "application/pdf") + continue; +#endif if (have_type_descs && i < type_descs.size()) mime.description = UTF8ToWide(type_descs[i]); SplitString(StringToLowerASCII(type_strings[2*i+1]), ',', |