diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-19 00:17:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-19 00:17:25 -0800 |
| commit | 9611825c90fe01b75193ac4163b022178404e1f3 (patch) | |
| tree | d80a07776994614888ae093b9b71795f704ce286 | |
| parent | 1a318d002f30c34f2a43bbd33897398ea2966f9c (diff) | |
| parent | 6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a (diff) | |
| download | external_webkit-9611825c90fe01b75193ac4163b022178404e1f3.zip external_webkit-9611825c90fe01b75193ac4163b022178404e1f3.tar.gz external_webkit-9611825c90fe01b75193ac4163b022178404e1f3.tar.bz2 | |
am 6a5a35ed: Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
Merge commit '6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a' into eclair-mr2-plus-aosp
* commit '6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a':
Should check the enable plugin settings before accepting
| -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; |