[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 f30bc2162f2cfa9c80c3facfe0d296bd94fd68fc
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 16:41:10 2003 +0000

    	Fixed: <rdar://problem/3463144>: assertion failure when viewing jpeg with SoundPix installed
    
            Reviewed by john.
    
            * WebView.subproj/WebDataSource.m:
            (+[WebDataSource _repTypesAllowImageTypeOmission:]): don't allow image types to override types that are already registered as we do in [WebFrameView _viewTypesAllowImageTypeOmission:]
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5276 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d2d3aa3..95d45d2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-27  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3463144>: assertion failure when viewing jpeg with SoundPix installed
+
+        Reviewed by john.
+
+        * WebView.subproj/WebDataSource.m:
+        (+[WebDataSource _repTypesAllowImageTypeOmission:]): don't allow image types to override types that are already registered as we do in [WebFrameView _viewTypesAllowImageTypeOmission:]
+
 2003-10-24  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed:
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index e68f96a..e1abab3 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -454,7 +454,9 @@
         NSString *mime;
         while ((mime = [enumerator nextObject]) != nil) {
             // Don't clobber previously-registered rep classes.
-            [repTypes setObject:[WebImageRepresentation class] forKey:mime];
+            if ([repTypes objectForKey:mime] == nil) {
+                [repTypes setObject:[WebImageRepresentation class] forKey:mime];
+            }
         }
         addedImageTypes = YES;
     }

-- 
WebKit Debian packaging