diff options
| author | Patrick Scott <phanna@android.com> | 2010-08-17 08:04:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-17 08:04:07 -0700 |
| commit | 4bd4a23f634cde6e058898549605ea9a3bf3ec3c (patch) | |
| tree | d5a830617f6536a1068aeafde18e9391d54a0373 /WebKit | |
| parent | cfddf9ccc414ba4b5ebea868d80d8daba7bc726a (diff) | |
| parent | 5165094157ce50696d79167abc1125fc4b38b545 (diff) | |
| download | external_webkit-4bd4a23f634cde6e058898549605ea9a3bf3ec3c.zip external_webkit-4bd4a23f634cde6e058898549605ea9a3bf3ec3c.tar.gz external_webkit-4bd4a23f634cde6e058898549605ea9a3bf3ec3c.tar.bz2 | |
Merge "Don't show text/vnd* mime types in the Browser."
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index f5b8a20..95673d7 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -775,7 +775,8 @@ bool FrameLoaderClientAndroid::canShowMIMEType(const String& mimeType) const { && m_frame->settings()->arePluginsEnabled() && PluginDatabase::installedPlugins()->isMIMETypeRegistered( mimeType)) || - DOMImplementation::isTextMIMEType(mimeType) || + (DOMImplementation::isTextMIMEType(mimeType) && + !mimeType.startsWith("text/vnd")) || DOMImplementation::isXMLMIMEType(mimeType)) return true; return false; |