commit 0981d957132dc87d7cd48ae62a37002cb37c811d
author Grace Kloba <klobag@google.com> Mon Jan 18 12:12:44 2010 -0800
committer Grace Kloba <klobag@google.com> Mon Jan 18 12:12:44 2010 -0800
tree 97db2c776003777bcf850c457e8a4824e217c93d
parent b8a548263905542f52acfc60682693972f098d25

Should check the enable plugin settings before accepting
the plugin mimetypes.

WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp

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 @@
     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;