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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 7bc5552c57d1e7cf902ad051a9a13965f8612969
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Apr 26 04:13:11 2003 +0000

    Backed out Richard's (hopefully) accidental checkin of our experiments
    from earlier today.  Otherwise many layout tests are hosed.  But this
    change, or something like it, will arrive soon.
    
    Reviewed by me.
    
    * WebCoreSupport.subproj/WebTextRenderer.m:
    (-[WebTextRenderer initWithFont:usingPrinterFont:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 391d28c..dc2fe49 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-25  Don Melton  <gramps at apple.com>
+
+	Backed out Richard's (hopefully) accidental checkin of our experiments
+	from earlier today.  Otherwise many layout tests are hosed.  But this
+	change, or something like it, will arrive soon.
+
+        Reviewed by me.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer initWithFont:usingPrinterFont:]):
+
 2003-04-25  Richard Williamson   <rjw at apple.com>
 
         API changes from final review meeting.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 3fe688d..f0faf31 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -493,7 +493,7 @@ static inline BOOL _fontContainsString (NSFont *font, NSString *string)
     float asc = (ScaleEmToUnits(metrics->ascent, unitsPerEm)*pointSize);
     float dsc = (-ScaleEmToUnits(metrics->descent, unitsPerEm)*pointSize);
     float lineGap = ScaleEmToUnits(metrics->lineGap, unitsPerEm)*pointSize;
-    float akiAdjustment = 0;
+    float akiAdjustment;
 
     ascent = ROUND_TO_INT(asc);
     descent = ROUND_TO_INT(dsc);
@@ -502,8 +502,8 @@ static inline BOOL _fontContainsString (NSFont *font, NSString *string)
     // ascender and descender).  The check is performed by _forceAscenderDelta, but that
     // method caches the result for the entire font family.  Here we reset the cache bit
     // before calling the check method.
-    //[((NSCGSFont *)f) _resetLineHeightAdjustmentCache];
-    //akiAdjustment = ([font _forceAscenderDelta] ? floor(((asc + dsc) * 0.20) + 0.5) : 0.0);
+    [((NSCGSFont *)f) _resetLineHeightAdjustmentCache];
+    akiAdjustment = ([font _forceAscenderDelta] ? floor(((asc + dsc) * 0.20) + 0.5) : 0.0);
 
     lineSpacing =  ascent + descent + (int)(lineGap > 0.0 ? floor(lineGap + 0.5) : 0.0) + akiAdjustment;
 

-- 
WebKit Debian packaging