[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit d639fd0b82ae4abf48180b8ab4e219d3b139527b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 24 16:06:56 2003 +0000

    	Fixed: <rdar://problem/3462256>: REGRESSION: Plain text is downloaded
    
            Reviewed by john.
    
            * WebView.subproj/WebView.m:
    	(+[WebView _viewClass:andRepresentationClass:forMIMEType:]): use _web_objectForMIMEType when getting an object for a MIME. Removed unnecessary code that checked for the document classes after loading the plug-in DB since it is not an optimization because the plug-in DB calls _viewTypesAllowImageTypeOmission:NO.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0aac5f3..d731d0f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-24  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3462256>: REGRESSION: Plain text is downloaded
+
+        Reviewed by john.
+
+        * WebView.subproj/WebView.m:
+	(+[WebView _viewClass:andRepresentationClass:forMIMEType:]): use _web_objectForMIMEType when getting an object for a MIME. Removed unnecessary code that checked for the document classes after loading the plug-in DB since it is not an optimization because the plug-in DB calls _viewTypesAllowImageTypeOmission:NO.
+
 2003-10-23  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3364036>: ER: Allow plug-ins to override built-in types such as image/jpeg
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index ced6cc2..7e27c12 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -149,8 +149,8 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
     
     // Simple optimization that avoids loading the plug-in DB and image types for the HTML case.
     if ([self canShowMIMETypeAsHTML:MIMEType]) {
-        viewClass = [[WebFrameView _viewTypesAllowImageTypeOmission:YES] objectForKey:MIMEType];
-        repClass = [[WebDataSource _repTypesAllowImageTypeOmission:YES] objectForKey:MIMEType];
+        viewClass = [[WebFrameView _viewTypesAllowImageTypeOmission:YES] _web_objectForMIMEType:MIMEType];
+        repClass = [[WebDataSource _repTypesAllowImageTypeOmission:YES] _web_objectForMIMEType:MIMEType];
         if (viewClass && repClass) {
             if (vClass) {
                 *vClass = viewClass;
@@ -164,21 +164,10 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
     
     // Load the plug-in DB allowing plug-ins to install types.
     [[WebPluginDatabase installedPlugins] loadPluginIfNeededForMIMEType:MIMEType];
-    viewClass = [[WebFrameView _viewTypesAllowImageTypeOmission:YES] objectForKey:MIMEType];
-    repClass = [[WebDataSource _repTypesAllowImageTypeOmission:YES] objectForKey:MIMEType];
-    if (viewClass && repClass) {
-        if (vClass) {
-            *vClass = viewClass;
-        }
-        if (rClass) {
-            *rClass = repClass;
-        }
-        return YES;
-    }
     
     // Load the image types and get the view class and rep class. This should be the fullest picture of all handled types.
-    viewClass = [[WebFrameView _viewTypesAllowImageTypeOmission:NO] objectForKey:MIMEType];
-    repClass = [[WebDataSource _repTypesAllowImageTypeOmission:NO] objectForKey:MIMEType];
+    viewClass = [[WebFrameView _viewTypesAllowImageTypeOmission:NO] _web_objectForMIMEType:MIMEType];
+    repClass = [[WebDataSource _repTypesAllowImageTypeOmission:NO] _web_objectForMIMEType:MIMEType];
     if (viewClass && repClass) {
         // Special-case WebTextView for text types that shouldn't be shown.
         if (viewClass == [WebTextView class] &&

-- 
WebKit Debian packaging