Fixed build problem on Tiger8A821. Private macro and function

	we were using have been deprecated,

        Reviewed by Vicki.

        * WebCoreSupport.subproj/WebTextRenderer.m:
        (-[WebTextRenderer initWithFont:usingPrinterFont:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 976efefa18a08343619bc3a973c83a3f8475e3b6..f62d481e59f8631738e6b8629cb69e21962dd750 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-02  Richard Williamson   <rjw@apple.com>
+
+       Fixed build problem on Tiger8A821.  Private macro and function
+       we were using have been deprecated,
+
+        Reviewed by Vicki.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer initWithFont:usingPrinterFont:]):
+
 2004-12-01  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3879870> Flash Player unable to stop data stream from continuing to download by returning -1 from NPP_Write

diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index cc452f139c28af0cdc2de4e2078283dbea38e266..586b0d74486f47e1104f20a07d88e96a2fde16a8 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -73,6 +73,12 @@
 #define SMALLCAPS_FONTSIZE_MULTIPLIER 0.7
 #define INVALID_WIDTH -(__FLT_MAX__)
 
+#if !defined(ScaleEmToUnits)
+#define CONTEXT_DPI    (72.0)
+
+#define ScaleEmToUnits(X, U_PER_EM)    (X * ((1.0 * CONTEXT_DPI) / (CONTEXT_DPI * U_PER_EM)))
+#endif
+
 // Datatypes
 typedef float WebGlyphWidth;
 typedef UInt32 UnicodeChar;
@@ -334,10 +340,9 @@ static BOOL alwaysUseATSU = NO;
         }
 
         // Report the problem.
-        ERROR ("Corrupt font detected, using %@ in place of %@ (%d glyphs) located at \"%@\".", 
+        ERROR ("Corrupt font detected, using %@ in place of %@ located at \"%@\".", 
                     [font familyName], 
                     [initialFont familyName],
-                    ATSFontGetGlyphCount(ATSFontRefFromNSFont(initialFont)),
                     filePath);
     }