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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 55effb6036f8c072cdf7a6dc2f92e9e7f8b0d965
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 19:17:40 2003 +0000

            Reviewed by Don.
    
            - at Scott and Don's request, roll out small text anti-aliasing cutoff
    
            Turns out this makes small text look worse, not better. We're not going to respect
            this setting, and in Panther AppKit will almost certainly be changed not to either.
    
            * WebCoreSupport.subproj/WebTextRenderer.m: Rolled out yesterday's change using CVS.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 36cd102..a29b853 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-01-02  Darin Adler  <darin at apple.com>
 
+        Reviewed by Don.
+
+        - at Scott and Don's request, roll out small text anti-aliasing cutoff
+
+        Turns out this makes small text look worse, not better. We're not going to respect
+        this setting, and in Panther AppKit will almost certainly be changed not to either.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m: Rolled out yesterday's change using CVS.
+
+2003-01-02  Darin Adler  <darin at apple.com>
+
         Reviewed by John and Don.
 
 	- fixed 3137661 -- REGRESSION: autoscroll selection is broken
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 1ec02cd..6ada6e8 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -294,25 +294,11 @@ static BOOL bufferTextDrawing = NO;
     return bufferTextDrawing;
 }
 
-static float _WebAntiAliasingThreshold = 9.0;
-
-+ (void)_updateAntialiasingThreshold {
-    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-    id val;
-
-    [userDefaults synchronize];
-    val = [userDefaults objectForKey:@"AppleAntiAliasingThreshold"];
-    _WebAntiAliasingThreshold = (val ? [val floatValue] : _WebAntiAliasingThreshold);
-}
-
 + (void)initialize
 {
     WebKitInitializeUnicode();
     nonBaseChars = CFCharacterSetGetPredefined(kCFCharacterSetNonBase);
     bufferTextDrawing = [[[NSUserDefaults standardUserDefaults] stringForKey:@"BufferTextDrawing"] isEqual: @"YES"];
-
-    [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAntialiasingThreshold)                                                                 name:@"AppleAquaAntiAliasingChanged" object:nil                                                 suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
-    [WebTextRenderer _updateAntialiasingThreshold];
 }
 
 static inline BOOL _fontContainsString (NSFont *font, NSString *string)
@@ -628,17 +614,12 @@ static inline BOOL _fontContainsString (NSFont *font, NSString *string)
     return [font xHeight];
 }
 
+
 // Useful page for testing http://home.att.net/~jameskass
 static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *advances, float x, float y, int numGlyphs)
 {
-    NSGraphicsContext *gc = [NSGraphicsContext currentContext];
     CGContextRef cgContext;
 
-    BOOL flag = [gc shouldAntialias];
-
-    if ([font pointSize] <= _WebAntiAliasingThreshold)
-        [gc setShouldAntialias: NO];
-
     if ([WebTextRenderer shouldBufferTextDrawing] && [[WebTextRendererFactory sharedFactory] coalesceTextDrawing]){
         // Add buffered glyphs and advances
         // FIXME:  If we ever use this again, need to add RTL.
@@ -646,7 +627,7 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         [gBuffer addGlyphs: glyphs advances: advances count: numGlyphs at: x : y];
     }
     else {
-        cgContext = (CGContextRef)[gc graphicsPort];
+        cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
         // Setup the color and font.
         [color set];
         [font set];
@@ -654,7 +635,6 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         CGContextSetTextPosition (cgContext, x, y);
         CGContextShowGlyphsWithAdvances (cgContext, glyphs, advances, numGlyphs);
     }
-    [gc setShouldAntialias: flag];
 }
 
 - (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withPadding: (int)padding withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor rightToLeft: (BOOL)rtl letterSpacing: (int)letterSpacing wordSpacing: (int)wordSpacing fontFamilies: (NSString **)families

-- 
WebKit Debian packaging