diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-18 23:48:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-18 23:48:45 -0800 |
| commit | 6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a (patch) | |
| tree | d80a07776994614888ae093b9b71795f704ce286 /WebKit | |
| parent | 336f436ca1f1b868aeabd408e8dbb5d1e893d701 (diff) | |
| parent | 0981d957132dc87d7cd48ae62a37002cb37c811d (diff) | |
| download | external_webkit-6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a.zip external_webkit-6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a.tar.gz external_webkit-6a5a35eda549fa8b36a4a23f5006b7a6b4983a5a.tar.bz2 | |
Merge "Should check the enable plugin settings before accepting the plugin mimetypes." into eclair-mr2
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; |