Changeset 23529 in webkit

Timestamp:

Jun 14, 2007 10:21:04 AM (17 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

<rdar://problem/5211677>
-[WebPreferences setJavaEnabled:] only disables java inside <applet>, not <object>

• loader/FrameLoader.cpp: (WebCore::FrameLoader::requestObject): If the object is a Java MIME type and Java is disabled, don't load the plug-in.

• platform/MimeTypeRegistry.cpp: (WebCore::MimeTypeRegistry::isJavaAppletMIMEType): Clean this up and add another applet MIME type.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• platform/MimeTypeRegistry.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        <rdar://problem/5211677>
+        -[WebPreferences setJavaEnabled:] only disables java inside <applet>, not <object>
+        
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::requestObject):
+        If the object is a Java MIME type and Java is disabled, don't load the plug-in.
+        
+        * platform/MimeTypeRegistry.cpp:
+        (WebCore::MimeTypeRegistry::isJavaAppletMIMEType):
+        Clean this up and add another applet MIME type.
+
 2007-06-14  George Staikos  <staikos@kde.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -63 +63 @@
 #include "Logging.h"
 #include "MainResourceLoader.h"
+#include "MimeTypeRegistry.h"
 #include "Page.h"
 #include "PageCache.h"
@@ -1444 +1445 @@
     if (shouldUsePlugin(completedURL, mimeType, renderer->hasFallbackContent(), useFallback)) {
         Settings* settings = m_frame->settings();
-        if (!settings || !settings->arePluginsEnabled())
+        if (!settings || !settings->arePluginsEnabled() || 
+            (!settings->isJavaEnabled() && MimeTypeRegistry::isJavaAppletMIMEType(mimeType)))
             return false;
         return loadPlugin(renderer, completedURL, mimeType, paramNames, paramValues, useFallback);

trunk/WebCore/platform/MimeTypeRegistry.cpp

@@ -175 +175 @@
 {
     // Since this set is very limited and is likely to remain so we won't bother with the overhead
-    // of using a Hashset.
-    // Note - "application/x-java-applet" may be followed by any number of specific versions of the JVM,
+    // of using a hash set.
+    // Any of the MIME types below may be followed by any number of specific versions of the JVM,
     // which is why we use startsWith()
-    
-    String lower = mimeType.lower();
-    return lower.startsWith("application/x-java-applet") || lower == "application/x-java-vm";
+    return mimeType.startsWith("application/x-java-applet", false) 
+        || mimeType.startsWith("application/x-java-bean", false) 
+        || mimeType.startsWith("application/x-java-vm", false);
 }