[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 a9e394c3d71da46695ce1081183e7c8615777eda
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 18:47:02 2002 +0000

    WebKit:
    
    	Re-enable wizzy scaling.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _iconByScalingIcon:toSize:]):
    
    WebBrowser:
    
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor _incrementProgressBarWithProgress:previousProgress:isMainResource:]): renamed
            (-[LoadProgressMonitor monitorResource:withProgress:error:dataSource:]): _incrementProgressBarWithProgress:previousProgress:isMainResource:
            (-[LoadProgressMonitor finishedLoadingFrame:]): stop progress bar only if data was received
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b49a0cd..a14fe72 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-09  Chris Blumenberg  <cblu at apple.com>
+
+	Re-enable wizzy scaling.
+	
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]):
+
 2002-09-09  Ken Kocienda  <kocienda at apple.com>
 
 	WebResourcehandle no longer has a contentType method.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b49a0cd..a14fe72 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-09  Chris Blumenberg  <cblu at apple.com>
+
+	Re-enable wizzy scaling.
+	
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]):
+
 2002-09-09  Ken Kocienda  <kocienda at apple.com>
 
 	WebResourcehandle no longer has a contentType method.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index cd0b7fc..683fcc5 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -720,8 +720,7 @@ NSSize WebIconMediumSize = {32, 32};
         
     start = CFAbsoluteTimeGetCurrent();
 
-    // Commented out because this was raising "Can't cache image" exceptions in NSImage
-    if(0 /*[[NSUserDefaults standardUserDefaults] boolForKey:@"Experiments"]*/){
+    if([[NSUserDefaults standardUserDefaults] boolForKey:@"Experiments"]){
         // Note: This doesn't seem to make a difference for scaling up.
         
         NSSize originalSize = [icon size];

-- 
WebKit Debian packaging