2008-02-28 Mark Rowe <mrowe@apple.com>

[WebKit-https.git] / WebCore / platform / graphics / mac / SimpleFontDataMac.mm

diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index 1f45c94c0ce65333ba23949a8aa545c093bf8208..7c97e8c1b8780bd47e97ed396cc63989f73f9c1b 100644 (file)
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -165,7 +165,15 @@ void SimpleFontData::platformInit()
     int iAscent;
     int iDescent;
     int iLineGap;
-    wkGetFontMetrics(m_font.m_cgFont, &iAscent, &iDescent, &iLineGap, &m_unitsPerEm); 
+#ifdef BUILDING_ON_TIGER
+    wkGetFontMetrics(m_font.m_cgFont, &iAscent, &iDescent, &iLineGap, &m_unitsPerEm);
+#else
+    iAscent = CGFontGetAscent(m_font.m_cgFont);
+    iDescent = CGFontGetDescent(m_font.m_cgFont);
+    iLineGap = CGFontGetLeading(m_font.m_cgFont);
+    m_unitsPerEm = CGFontGetUnitsPerEm(m_font.m_cgFont);
+#endif
+
     float pointSize = m_font.m_size;
     float fAscent = scaleEmToUnits(iAscent, m_unitsPerEm) * pointSize;
     float fDescent = -scaleEmToUnits(iDescent, m_unitsPerEm) * pointSize;