Reviewed by Darin Adler.

        <rdar://problem/4688618> REGRESSION(10.4.7-9A241): JMol java applet fails in Safari not Firefox

        No layout test for now because Java doesn't work in DumpRenderTree.

        * Plugins/WebPluginDatabase.m:
        (-[WebPluginDatabase refresh]):
        Add each plug-in MIME type to registeredMIMETypes, even if we don't register a document view class for the
        MIME type.  This fixes -[WebPluginDatabase isMIMETypeRegistered:] and thus fallback content for Java applets
        (we were always rendering fallback content, if any, for Java applets).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16101 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b0ce5a15c2115d44f8ca41de3d3d8bab7757fc27..7c9350a3530b94de65671b60eb17ff19d9fe56b5 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2006-08-29  Tim Omernick  <timo@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/4688618> REGRESSION(10.4.7-9A241): JMol java applet fails in Safari not Firefox
+
+        No layout test for now because Java doesn't work in DumpRenderTree.
+
+        * Plugins/WebPluginDatabase.m:
+        (-[WebPluginDatabase refresh]):
+        Add each plug-in MIME type to registeredMIMETypes, even if we don't register a document view class for the
+        MIME type.  This fixes -[WebPluginDatabase isMIMETypeRegistered:] and thus fallback content for Java applets
+        (we were always rendering fallback content, if any, for Java applets).
+

 2006-08-29  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.
 2006-08-29  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.

diff --git a/WebKit/Plugins/WebPluginDatabase.m b/WebKit/Plugins/WebPluginDatabase.m
index 2ae75e058395df15b2c47cbf9de0f225455ea792..deb940e12f3b986f855722d97430c1fc2972273f 100644 (file)
--- a/WebKit/Plugins/WebPluginDatabase.m
+++ b/WebKit/Plugins/WebPluginDatabase.m
@@ -252,6 +252,8 @@ static NSArray *additionalWebPlugInPaths;
     NSEnumerator *MIMEEnumerator = [MIMETypes objectEnumerator];
     NSString *MIMEType;
     while ((MIMEType = [MIMEEnumerator nextObject]) != nil) {
     NSEnumerator *MIMEEnumerator = [MIMETypes objectEnumerator];
     NSString *MIMEType;
     while ((MIMEType = [MIMEEnumerator nextObject]) != nil) {

+        [registeredMIMETypes addObject:MIMEType];
+

         if ([WebView canShowMIMETypeAsHTML:MIMEType])
             // Don't allow plug-ins to override our core HTML types.
             continue;
         if ([WebView canShowMIMETypeAsHTML:MIMEType])
             // Don't allow plug-ins to override our core HTML types.
             continue;


@@ -265,7 +267,6 @@ static NSArray *additionalWebPlugInPaths;
         
         if (self == database)
             [WebView registerViewClass:[WebHTMLView class] representationClass:[WebHTMLRepresentation class] forMIMEType:MIMEType];
         
         if (self == database)
             [WebView registerViewClass:[WebHTMLView class] representationClass:[WebHTMLRepresentation class] forMIMEType:MIMEType];

-        [registeredMIMETypes addObject:MIMEType];

     }
     [MIMETypes release];
     
     }
     [MIMETypes release];