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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 0d525945feac7cc2f19040d5edff22a4e5a69161
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 21 14:31:45 2003 +0000

            Reviewed by me.
    
    	Fixed build breaker.
    
    	Removed glyphCountFromFont function. It was used only in an
    	ERROR function, which does not compile in on deployment
    	builds, causing a "defined, but not used warning".
    
    	As this function is only a one-liner call into ATS, I
    	replaced the usage in the ERROR call with a call to the
    	ATS function directly.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer initWithFont:usingPrinterFont:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d14762d..6969d11 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-07-21  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me.
+
+	Fixed build breaker.
+
+	Removed glyphCountFromFont function. It was used only in an
+	ERROR function, which does not compile in on deployment
+	builds, causing a "defined, but not used warning".
+
+	As this function is only a one-liner call into ATS, I 
+	replaced the usage in the ERROR call with a call to the 
+	ATS function directly.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer initWithFont:usingPrinterFont:])
+
 2003-07-18  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3283594.  "Times RO" appears to have a corrupt regular variant.  Added
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 05078ba..7f81419 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -554,11 +554,6 @@ static NSString *pathFromFont (NSFont *font)
     return filePath;
 }
 
-static UInt16 glyphCountFromFont (NSFont *font)
-{
-    return ATSFontGetGlyphCount(ATSFontRefFromNSFont(font));
-}
-
 static NSString *WebFallbackFontFamily;
 
 - initWithFont:(NSFont *)f usingPrinterFont:(BOOL)p
@@ -609,7 +604,7 @@ static NSString *WebFallbackFontFamily;
         ERROR ("Corrupt font detected, using %@ in place of %@ (%d glyphs) located at \"%@\".", 
                     [alternateFont familyName], 
                     [initialFont familyName],
-                    glyphCountFromFont(initialFont),
+                    ATSFontGetGlyphCount(ATSFontRefFromNSFont(initialFont)),
                     filePath);
     }
 

-- 
WebKit Debian packaging