Fixed: <rdar://problem/3851491> installedPlugins being called for a page without...
authorcblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Oct 2004 00:19:49 +0000 (00:19 +0000)
committercblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Oct 2004 00:19:49 +0000 (00:19 +0000)
        Reviewed by mjs.

        * WebView.subproj/WebFrameView.m:
        (+[WebFrameView _canShowMIMETypeAsHTML:]): call _viewTypesAllowImageTypeOmission instead of using ivar since the ivar is nil until _viewTypesAllowImageTypeOmission is called, this was causing [WebView canShowMIMEType:] to check plug-ins

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

WebKit/ChangeLog
WebKit/WebView.subproj/WebFrameView.m

index 9976bbd881fc72c8b3bfa356f5b7c930ac062ea4..c4ac4a248545cbc3725fca07ea4e32d9b2a24042 100644 (file)
@@ -1,3 +1,12 @@
+2004-10-22  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3851491> installedPlugins being called for a page without plugins
+
+        Reviewed by mjs.
+
+        * WebView.subproj/WebFrameView.m:
+        (+[WebFrameView _canShowMIMETypeAsHTML:]): call _viewTypesAllowImageTypeOmission instead of using ivar since the ivar is nil until _viewTypesAllowImageTypeOmission is called, this was causing [WebView canShowMIMEType:] to check plug-ins 
+
 === Safari-168 ===
 
 2004-10-22  Ken Kocienda  <kocienda@apple.com>
index 565103cb1301f0e3c84517207fbc5e6178c9ccb2..fb3db6f7a7fb468a6e44ce0709cbe4d4bf9b8bd7 100644 (file)
@@ -254,7 +254,7 @@ static NSMutableDictionary *viewTypes;
 
 + (BOOL)_canShowMIMETypeAsHTML:(NSString *)MIMEType
 {
-    return ([viewTypes objectForKey:MIMEType] == [WebHTMLView class]);
+    return [[[self _viewTypesAllowImageTypeOmission:YES] objectForKey:MIMEType] isSubclassOfClass:[WebHTMLView class]];
 }
 
 + (Class)_viewClassForMIMEType:(NSString *)MIMEType