diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-18 12:12:44 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-18 12:12:44 -0800 |
| commit | 0981d957132dc87d7cd48ae62a37002cb37c811d (patch) | |
| tree | 97db2c776003777bcf850c457e8a4824e217c93d /WebKit/android | |
| parent | b8a548263905542f52acfc60682693972f098d25 (diff) | |
| download | external_webkit-0981d957132dc87d7cd48ae62a37002cb37c811d.zip external_webkit-0981d957132dc87d7cd48ae62a37002cb37c811d.tar.gz external_webkit-0981d957132dc87d7cd48ae62a37002cb37c811d.tar.bz2 | |
Should check the enable plugin settings before accepting
the plugin mimetypes.
Diffstat (limited to 'WebKit/android')
| -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; |