diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-16 17:35:58 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-16 17:35:58 +0000 |
| commit | b49d98999799ff9406302fa75b5011e95fb153bc (patch) | |
| tree | 925164b2a0dfddb255bb05dc5fcdb263e5cc963f | |
| parent | bc4b66f42c169b03559773f2b7181b2b95cbe8cd (diff) | |
Remove SK_FONTHOST_WIN_DW define.
git-svn-id: http://skia.googlecode.com/svn/trunk@5132 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common.gypi | 5 | ||||
| -rw-r--r-- | samplecode/SampleTextBox.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 08c266e5dc..4b558f893e 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -50,11 +50,6 @@ ], } ], - [ 'skia_directwrite', { - 'defines': [ - 'SK_FONTHOST_WIN_DW', - ], - }], [ 'skia_mesa', { 'defines': [ 'SK_MESA', diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp index 6b4f3f3710..6a8c50ebfa 100644 --- a/samplecode/SampleTextBox.cpp +++ b/samplecode/SampleTextBox.cpp @@ -30,7 +30,7 @@ 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 @@ -45,7 +45,7 @@ static const char gText[] = 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; diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index c3cb3d8c3e..e91b2e50e5 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -12,7 +12,7 @@ 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 @@ -257,14 +257,13 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( // 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, |