Reviewed by Geoff.
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jun 2007 17:21:04 +0000 (17:21 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jun 2007 17:21:04 +0000 (17:21 +0000)
commit68fe077dcb89933e4b39a19a04bb228f7d5304ac
tree93f82d99c3b4a05a30f928e8893eea1cfa0e1eca
parent23e8e30f938674612adae88170b9b16da3c4f682
    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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebCore/ChangeLog
WebCore/loader/FrameLoader.cpp
WebCore/platform/MimeTypeRegistry.cpp