Changeset 246831 in webkit

Timestamp:

Jun 25, 2019 8:51:59 PM (5 years ago)

Author:

Fujii Hironori

Message:

[WinCairo] incorrect font height for 'Google Sans Display' font
​https://bugs.webkit.org/show_bug.cgi?id=198909

Reviewed by Frédéric Wang.

r191893 changed to use OS/2 typo metrics, but its calculation
wasn't correct. And, there is no reliable way to get OS/2 table by
using Windows API. Revert the part of r191893 change at the
moment.

• platform/graphics/win/SimpleFontDataCairoWin.cpp:

(WebCore::Font::platformInit):

• platform/graphics/win/SimpleFontDataWin.cpp:

(WebCore::Font::initGDIFont):
Reverted the part of r191893 change, and added FIXME comments.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-25  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] incorrect font height for 'Google Sans Display' font
+        https://bugs.webkit.org/show_bug.cgi?id=198909
+
+        Reviewed by Frédéric Wang.
+
+        r191893 changed to use OS/2 typo metrics, but its calculation
+        wasn't correct. And, there is no reliable way to get OS/2 table by
+        using Windows API. Revert the part of r191893 change at the
+        moment.
+
+        * platform/graphics/win/SimpleFontDataCairoWin.cpp:
+        (WebCore::Font::platformInit):
+        * platform/graphics/win/SimpleFontDataWin.cpp:
+        (WebCore::Font::initGDIFont):
+        Reverted the part of r191893 change, and added FIXME comments.
+
 2019-06-25  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -68 +68 @@
     cairo_win32_scaled_font_select_font(scaledFont, dc);
 
-    OUTLINETEXTMETRIC metrics;
-    GetOutlineTextMetrics(dc, sizeof(metrics), &metrics);
-    TEXTMETRIC& textMetrics = metrics.otmTextMetrics;
-    float ascent, descent, lineGap;
-    // The Open Font Format describes the OS/2 USE_TYPO_METRICS flag as follows:
-    // "If set, it is strongly recommended to use OS/2.sTypoAscender - OS/2.sTypoDescender+ OS/2.sTypoLineGap as a value for default line spacing for this font."
-    const UINT useTypoMetricsMask = 1 << 7;
-    if (metrics.otmfsSelection & useTypoMetricsMask) {
-        ascent = metrics.otmAscent * metricsMultiplier;
-        descent = metrics.otmDescent * metricsMultiplier;
-        lineGap = metrics.otmLineGap * metricsMultiplier;
-    } else {
-        ascent = textMetrics.tmAscent * metricsMultiplier;
-        descent = textMetrics.tmDescent * metricsMultiplier;
-        lineGap = textMetrics.tmExternalLeading * metricsMultiplier;
-    }
-    float xHeight = ascent * 0.56f; // Best guess for xHeight for non-Truetype fonts.
+    // FIXME: Needs to take OS/2 USE_TYPO_METRICS flag into account
+    // https://bugs.webkit.org/show_bug.cgi?id=199186
+    TEXTMETRIC textMetrics;
+    GetTextMetrics(dc, &textMetrics);
+    float ascent = textMetrics.tmAscent * metricsMultiplier;
+    float descent = textMetrics.tmDescent * metricsMultiplier;
+    float lineGap = textMetrics.tmExternalLeading * metricsMultiplier;
 
     m_fontMetrics.setAscent(ascent);
@@ -95 +85 @@
     cairo_text_extents_t extents;
     cairo_scaled_font_text_extents(scaledFont, "x", &extents);
-    xHeight = -extents.y_bearing;
+    float xHeight = -extents.y_bearing;
 
     m_fontMetrics.setXHeight(xHeight);

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

@@ -88 +88 @@
     GetOutlineTextMetrics(hdc, sizeof(metrics), &metrics);
     TEXTMETRIC& textMetrics = metrics.otmTextMetrics;
-    float ascent, descent, lineGap;
-    // The Open Font Format describes the OS/2 USE_TYPO_METRICS flag as follows:
-    // "If set, it is strongly recommended to use OS/2.sTypoAscender - OS/2.sTypoDescender+ OS/2.sTypoLineGap as a value for default line spacing for this font."
-    const UINT useTypoMetricsMask = 1 << 7;
-    if (metrics.otmfsSelection & useTypoMetricsMask) {
-        ascent = metrics.otmAscent;
-        descent = metrics.otmDescent;
-        lineGap = metrics.otmLineGap;
-    } else {
-        ascent = textMetrics.tmAscent;
-        descent = textMetrics.tmDescent;
-        lineGap = textMetrics.tmExternalLeading;
-    }
+    // FIXME: Needs to take OS/2 USE_TYPO_METRICS flag into account
+    // https://bugs.webkit.org/show_bug.cgi?id=199186
+    float ascent = textMetrics.tmAscent;
+    float descent = textMetrics.tmDescent;
+    float lineGap = textMetrics.tmExternalLeading;
     m_fontMetrics.setAscent(ascent);
     m_fontMetrics.setDescent(descent);