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

[Timothy]

thatcher    05/10/03 19:36:55

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebCoreSupport.subproj Tag: Safari-2-0-branch WebBridge.m
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      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.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.72 +22 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.71
  retrieving revision 1.3118.4.72
  diff -u -r1.3118.4.71 -r1.3118.4.72
  --- ChangeLog	30 Sep 2005 06:59:53 -0000	1.3118.4.71
  +++ ChangeLog	4 Oct 2005 02:36:38 -0000	1.3118.4.72
  @@ -1,3 +1,25 @@
  +2005-09-29  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    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.
  +
   === WebKit-417.1 ===
   
   2005-09-29  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.340.8.12 +9 -3      WebKit/WebCoreSupport.subproj/WebBridge.m
  
  Index: WebBridge.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
  retrieving revision 1.340.8.11
  retrieving revision 1.340.8.12
  diff -u -r1.340.8.11 -r1.340.8.12
  --- WebBridge.m	24 Aug 2005 18:16:22 -0000	1.340.8.11
  +++ WebBridge.m	4 Oct 2005 02:36:53 -0000	1.340.8.12
  @@ -1089,9 +1089,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;