extern void skia_set_text_gamma(float blackGamma, float whiteGamma);
-#if defined(SK_BUILD_FOR_WIN) && !defined(SK_FONTHOST_WIN_DW)
+#if defined(SK_BUILD_FOR_WIN) && defined(SK_FONTHOST_WIN_GDI)
extern SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&);
#endif
class TextBoxView : public SampleView {
public:
TextBoxView() {
-#if defined(SK_BUILD_FOR_WIN) && !defined(SK_FONTHOST_WIN_DW)
+#if defined(SK_BUILD_FOR_WIN) && defined(SK_FONTHOST_WIN_GDI)
LOGFONT lf;
sk_bzero(&lf, sizeof(lf));
lf.lfHeight = 9;
SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics)
-#if defined(SK_BUILD_FOR_WIN) && defined(SK_FONTHOST_WIN_DW)
+#if defined(SK_BUILD_FOR_WIN)
#include <DWrite.h>
#endif
// Make AdvanceMetric template functions available for linking with typename
// WidthRange and VerticalAdvanceRange.
-#if defined(SK_BUILD_FOR_WIN) && !defined(SK_FONTHOST_WIN_DW)
+#if defined(SK_BUILD_FOR_WIN)
template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
HDC hdc,
int num_glyphs,
const uint32_t* subsetGlyphIDs,
uint32_t subsetGlyphIDsLength,
bool (*getAdvance)(HDC hdc, int gId, int16_t* data));
-#elif defined(SK_BUILD_FOR_WIN) && defined(SK_FONTHOST_WIN_DW)
template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
IDWriteFontFace* fontFace,
int num_glyphs,