diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-19 00:34:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-19 00:34:41 -0800 |
| commit | a520cef6897e57379002eb132d95e1ce434750f4 (patch) | |
| tree | 6a6304d0db5ce38bab2640546b25b974dfa2cf88 /WebKit | |
| parent | 6b94858003959337be5bbea77dc00eb02299a16f (diff) | |
| parent | 9611825c90fe01b75193ac4163b022178404e1f3 (diff) | |
| download | external_webkit-a520cef6897e57379002eb132d95e1ce434750f4.zip external_webkit-a520cef6897e57379002eb132d95e1ce434750f4.tar.gz external_webkit-a520cef6897e57379002eb132d95e1ce434750f4.tar.bz2 | |
am 9611825c: am 6a5a35ed: Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
Merge commit '9611825c90fe01b75193ac4163b022178404e1f3'
* commit '9611825c90fe01b75193ac4163b022178404e1f3':
Should check the enable plugin settings before accepting
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index cb361bf..ae39820 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -727,7 +727,10 @@ bool FrameLoaderClientAndroid::canShowMIMEType(const String& mimeType) const { if (MIMETypeRegistry::isSupportedImageResourceMIMEType(mimeType) || MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) || - PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType) || + (m_frame && m_frame->settings() + && m_frame->settings()->arePluginsEnabled() + && PluginDatabase::installedPlugins()->isMIMETypeRegistered( + mimeType)) || DOMImplementation::isTextMIMEType(mimeType) || DOMImplementation::isXMLMIMEType(mimeType)) return true; |