[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 55544a0acfad0fd9ab79e22c6ca9e3a516a23072
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 7 23:55:57 2002 +0000

    WebKit:
    
    	Made the wizzy scaling an experiment.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _iconByScalingIcon:toSize:]):
    
    WebBrowser:
    
    	- Text field/location bar combo
    	- Added a defaults key "Experiments" as a way to toggle experimental features, behaviors etc.
    	- Added an "Experiments" debug menu item. Vague, but couldn't think of a better title.
    	- The text field/location bar combo is an "Experiment".
    
    	"Experiments" is off by default.
    
            * AppController.m:
            (-[AppController enableExperiments:]): toggle the default
            * BrowserWindowController.h:
            * BrowserWindowController.m:
            (-[BrowserWindowController setActivity:]): set _previousActivity so we know if we were searching or loading
            (-[BrowserWindowController textFieldToUpdateProgress]): added, returns the current text field that is showing a progress bar
            (-[BrowserWindowController setProgressBarValue:]): added, calls setProgressBarValue on current text field
            (-[BrowserWindowController incrementProgressBarBy:]): added, calls incrementProgressBarBy on current text field
            * Debug/DebugUtilities.m:
            (-[DebugUtilities createDebugMenu]):
            * LoadProgressMonitor.h:
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor initWithBrowserDocument:]): set _maxIncrement to the default
            (-[LoadProgressMonitor _setProgressBarValueToZero]): added
            (-[LoadProgressMonitor _stopProgressBar]): added
            (-[LoadProgressMonitor _incrementProgressBarWithProgress:previousProgress:isFrame:]): added, progress algorithm here
            (-[LoadProgressMonitor monitorResource:withProgress:error:dataSource:]): call _incrementProgressBarWithProgress:previousProgress:isFrame:
            (-[LoadProgressMonitor finishedLoadingFrame:]): call _stopProgressBar
            * LocationTextField.m:
            (-[LocationTextField setDisplayAttributes]): set progress images
            * PreferenceKeys.h:
            * Resources/Images/Location_Left_Progress.tif: Added.
            * Resources/Images/Location_Middle_Progress.tif: Added.
            * Resources/Images/Location_Right_Progress.tif: Added.
            * Resources/Images/Search_Left_Progress.tif: Added.
            * Resources/Images/Search_Middle_Progress.tif: Added.
            * Resources/Images/Search_Right_Progress.tif: Added.
            * SearchTextField.m:
            (-[SearchTextField setDisplayAttributes]): set progress images
            * TextFieldWithControls.h:
            * TextFieldWithControls.m:
            (-[TextFieldWithControls becomeFirstResponder]): call setIsShowingProgressBar:NO
            (-[TextFieldWithControls textDidEndEditing:]):	call setIsShowingProgressBar:YES
            (-[TextFieldWithControls dealloc]): release progress images
            (-[TextFieldWithControls backgroundImage]): added logic for showing progress bar
            (-[TextFieldWithControls setLeftProgressImage:]): added
            (-[TextFieldWithControls setRightProgressImage:]): added
            (-[TextFieldWithControls setMiddleProgressImage:]): added
            (-[TextFieldWithControls isShowingProgressBar]): added
            (-[TextFieldWithControls setIsShowingProgressBar:]): added
            (-[TextFieldWithControls setProgressBarValue:]): added
            (-[TextFieldWithControls incrementProgressBarBy:]): added
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 886e9f7..f437fe4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-07  Chris Blumenberg  <cblu at apple.com>
+
+	Made the wizzy scaling an experiment.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]):
+
 2002-09-06  Darin Adler  <darin at apple.com>
 
 	Almost weaned WebKit entirely from the handleDidBeginLoading and handleDidCancelLoading
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 886e9f7..f437fe4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-07  Chris Blumenberg  <cblu at apple.com>
+
+	Made the wizzy scaling an experiment.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _iconByScalingIcon:toSize:]):
+
 2002-09-06  Darin Adler  <darin at apple.com>
 
 	Almost weaned WebKit entirely from the handleDidBeginLoading and handleDidCancelLoading
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index be1eea9..37ab82a 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -713,22 +713,26 @@ NSSize WebIconMediumSize = {32, 32};
         
     start = CFAbsoluteTimeGetCurrent();
 
-#ifdef WIZZY_SCALING
-    NSSize originalSize = [icon size];
-    scaledIcon = [[NSImage alloc] initWithSize:size];
-    [scaledIcon lockFocus];
-    NSGraphicsContext *currentContent = [NSGraphicsContext currentContext];
-    [currentContent setImageInterpolation:NSImageInterpolationHigh];
-    [icon drawInRect:NSMakeRect(0, 0, size.width, size.height)
-            fromRect:NSMakeRect(0, 0, originalSize.width, originalSize.height)
-           operation:NSCompositeSourceOver	// Renders transparency correctly
-            fraction:1.0];
-    [scaledIcon unlockFocus];
-#else
-    [icon setScalesWhenResized:YES];
-    [icon setSize:size];
-    scaledIcon = icon;
-#endif
+    if([[NSUserDefaults standardUserDefaults] boolForKey:@"Experiments"]){
+        // Note: This doesn't seem to make a difference for scaling up.
+        
+        NSSize originalSize = [icon size];
+        scaledIcon = [[NSImage alloc] initWithSize:size];
+
+        [scaledIcon lockFocus];
+        NSGraphicsContext *currentContent = [NSGraphicsContext currentContext];
+        [currentContent setImageInterpolation:NSImageInterpolationHigh];
+        [icon drawInRect:NSMakeRect(0, 0, size.width, size.height)
+                fromRect:NSMakeRect(0, 0, originalSize.width, originalSize.height)
+            operation:NSCompositeSourceOver	// Renders transparency correctly
+                fraction:1.0];
+        [scaledIcon unlockFocus];
+        
+    }else{
+        scaledIcon = icon;
+        [scaledIcon setScalesWhenResized:YES];
+        [scaledIcon setSize:size];
+    }
     
     duration = CFAbsoluteTimeGetCurrent() - start;
     WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "scaling icon took %f seconds.", duration);

-- 
WebKit Debian packaging