[webkit-changes] cvs commit: WebKit/WebCoreSupport.subproj WebBridge.m

[Tim]

tomernic    05/10/03 18:31:53

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebBridge.m
  Log:
          Reviewed by John Sullivan, Maciej Stachowiak.
  
  	<rdar://problem/4281095> Denver regression: Seed: Safari HTML 4.01 <object ...> tag problem
  
          * WebCoreSupport.subproj/WebBridge.m:
          (-[WebBridge determineObjectFromMIMEType:URL:]):
  	If no view class is registered to handle the MIME type, check to see if there is a plugin registered which can handle it.
  	This check is required because the Java plugin does not register an NSView class, so that Java files are downloaded when
  	not embedded.
  
  	Prior to this fix, -determineObjectFromMIMEType:URL: would always return ObjectElementNone for Java applets (MIME type
  	"application/x-java-applet"), which would cause Java applets embedded in <OBJECT> elements to not be loaded.
  
  	This broke on 05-03-2005, when we changed how we handle fallback content for <OBJECT> elements so that we could pass the
  	Acid2 test.
  
  Revision  Changes    Path
  1.3337    +18 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3336
  retrieving revision 1.3337
  diff -u -r1.3336 -r1.3337
  --- ChangeLog	28 Sep 2005 21:04:47 -0000	1.3336
  +++ ChangeLog	4 Oct 2005 01:31:48 -0000	1.3337
  @@ -1,3 +1,21 @@
  +2005-10-03  Tim Omernick  <tomernick at apple.com>
  +
  +        Reviewed by John Sullivan.
  +
  +	<rdar://problem/4281095> Denver regression: Seed: Safari HTML 4.01 <object ...> tag problem
  +
  +        * WebCoreSupport.subproj/WebBridge.m:
  +        (-[WebBridge determineObjectFromMIMEType:URL:]):
  +	If no view class is registered to handle the MIME type, check to see if there is a plugin registered which can handle it.
  +	This check is required because the Java plugin does not register an NSView class, so that Java files are downloaded when
  +	not embedded.
  +
  +	Prior to this fix, -determineObjectFromMIMEType:URL: would always return ObjectElementNone for Java applets (MIME type
  +	"application/x-java-applet"), which would cause Java applets embedded in <OBJECT> elements to not be loaded.
  +
  +	This broke on 05-03-2005, when we changed how we handle fallback content for <OBJECT> elements so that we could pass the
  +	Acid2 test.
  +
   2005-09-28  Justin Garcia  <justin.garcia at apple.com>
   
           Reviewed by geoff
  
  
  
  1.370     +9 -3      WebKit/WebCoreSupport.subproj/WebBridge.m
  
  Index: WebBridge.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
  retrieving revision 1.369
  retrieving revision 1.370
  diff -u -r1.369 -r1.370
  --- WebBridge.m	24 Aug 2005 00:34:57 -0000	1.369
  +++ WebBridge.m	4 Oct 2005 01:31:52 -0000	1.370
  @@ -1118,9 +1118,15 @@
           return ObjectElementFrame; // Go ahead and hope that we can display the content.
                   
       Class viewClass = [WebFrameView _viewClassForMIMEType:MIMEType];
  -    if (!viewClass)
  -        // Nothing is registered at all.
  -        return ObjectElementNone;
  +    if (!viewClass) {
  +        // No view class is registered to handle this MIME type.  Check to see if there is a plugin which can handle this MIME type.
  +        // This check is required because the Java plugin does not register an NSView class, so that Java files are downloaded when 
  +        // not embedded.
  +        if ([[WebPluginDatabase installedPlugins] pluginForMIMEType:MIMEType])
  +            return ObjectElementPlugin;
  +        else
  +            return ObjectElementNone;
  +    }
       
       if ([viewClass isSubclassOfClass:[WebImageView class]])
           return ObjectElementImage;