[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 0fc96697b9ba0f51b8be5d1df60e482654b7fc84
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 15:35:49 2002 +0000

    WebKit:
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _iconByScalingIcon:toSize:]): Commented out wizzy scaling as it was causing an NSImage exception to be raised.
            * Plugins.subproj/WebPlugin.m:
            (-[WebNetscapePlugin _getPluginInfo]): Check Resource Manager errors
    
    WebBrowser:
    
            * BrowserWindowController.m:
            (-[BrowserWindowController textFieldWithProgressBar]): renamed, simplified
            (-[BrowserWindowController setProgressBarValue:]): call textFieldWithProgressBar
            (-[BrowserWindowController incrementProgressBarBy:]): call textFieldWithProgressBar
            * TextFieldWithControls.m:
            (-[TextFieldWithControls selectText:]): remove progress bar here
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a8e0b5d..6553597 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-09  Chris Blumenberg  <cblu at apple.com>
+
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]): Commented out wizzy scaling as it was causing an NSImage exception to be raised.
+        * Plugins.subproj/WebPlugin.m:
+        (-[WebNetscapePlugin _getPluginInfo]): Check Resource Manager errors
+
 2002-09-08  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a8e0b5d..6553597 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-09  Chris Blumenberg  <cblu at apple.com>
+
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]): Commented out wizzy scaling as it was causing an NSImage exception to be raised.
+        * Plugins.subproj/WebPlugin.m:
+        (-[WebNetscapePlugin _getPluginInfo]): Check Resource Manager errors
+
 2002-09-08  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 007a713..f603629 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -711,7 +711,8 @@ NSSize WebIconMediumSize = {32, 32};
         
     start = CFAbsoluteTimeGetCurrent();
 
-    if([[NSUserDefaults standardUserDefaults] boolForKey:@"Experiments"]){
+    // Commented out because this was raising "Can't cache image" exceptions in NSImage
+    if(0 /*[[NSUserDefaults standardUserDefaults] boolForKey:@"Experiments"]*/){
         // Note: This doesn't seem to make a difference for scaling up.
         
         NSSize originalSize = [icon size];
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index f468187..89a1304 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -73,6 +73,9 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
         return NO;
     
     UseResFile(resRef);
+    if(ResError() != noErr){
+        return NO;
+    }
     
     mimeTypes = [NSMutableArray arrayWithCapacity:1];
     for(n=1, i=0; 1; n+=2, i++){

-- 
WebKit Debian packaging