Changeset 173840 in webkit

Timestamp:

Sep 22, 2014 11:35:23 AM (10 years ago)

Author:

Brent Fulgham

Message:

[Win] Implement cap height in SimpleFontDataWin to enable initial-letter support for Windows.
​https://bugs.webkit.org/show_bug.cgi?id=136841

Reviewed by David Hyatt.

• platform/graphics/win/SimpleFontDataCGWin.cpp:

(WebCore::SimpleFontData::platformInit): Add missing calls to set up our fonts.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/SimpleFontDataCGWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-19  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Implement cap height in SimpleFontDataWin to enable initial-letter support for Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=136841
+
+        Reviewed by David Hyatt.
+
+        * platform/graphics/win/SimpleFontDataCGWin.cpp:
+        (WebCore::SimpleFontData::platformInit): Add missing calls to set up our fonts.
+
 2014-09-22  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp

@@ -63 +63 @@
     int iDescent = CGFontGetDescent(font);
     int iLineGap = CGFontGetLeading(font);
+    int iCapHeight = CGFontGetCapHeight(font);
     unsigned unitsPerEm = CGFontGetUnitsPerEm(font);
     float pointSize = m_platformData.size();
     float fAscent = scaleEmToUnits(iAscent, unitsPerEm) * pointSize;
     float fDescent = -scaleEmToUnits(iDescent, unitsPerEm) * pointSize;
+    float fCapHeight = scaleEmToUnits(iCapHeight, unitsPerEm) * pointSize;
     float fLineGap = scaleEmToUnits(iLineGap, unitsPerEm) * pointSize;
 
@@ -83 +85 @@
     m_fontMetrics.setAscent(fAscent);
     m_fontMetrics.setDescent(fDescent);
+    m_fontMetrics.setCapHeight(fCapHeight);
     m_fontMetrics.setLineGap(fLineGap);
     m_fontMetrics.setLineSpacing(lroundf(fAscent) + lroundf(fDescent) + lroundf(fLineGap));