summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-08-17 09:48:40 -0400
committerPatrick Scott <phanna@android.com>2010-08-17 09:48:40 -0400
commit5165094157ce50696d79167abc1125fc4b38b545 (patch)
treea727143d4c2088f13dc816bdf3c31e9ad392173d
parent55094dcb36140213cd67c1f77b4180e694d4f7c2 (diff)
downloadexternal_webkit-5165094157ce50696d79167abc1125fc4b38b545.zip
external_webkit-5165094157ce50696d79167abc1125fc4b38b545.tar.gz
external_webkit-5165094157ce50696d79167abc1125fc4b38b545.tar.bz2
Don't show text/vnd* mime types in the Browser.
Bug: 2809660 Change-Id: Idb0bdc33dae6e1148dc92ff1d0137550cc054e3a
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp3
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;