Chromium Code Reviews| Index: src/core/SkAdvancedTypefaceMetrics.cpp |
| diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp |
| index e41bb810b5df3e9d36f4f21a6ea905741f5b3a80..22431e887b774e3003fc698ae397361ae322db20 100644 |
| --- a/src/core/SkAdvancedTypefaceMetrics.cpp |
| +++ b/src/core/SkAdvancedTypefaceMetrics.cpp |
| @@ -16,11 +16,6 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics) |
| #include <dwrite.h> |
| #endif |
| -#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) |
| -#include <ft2build.h> |
| -#include FT_FREETYPE_H |
| -#endif |
| - |
| #ifdef SK_BUILD_FOR_MAC |
| #import <ApplicationServices/ApplicationServices.h> |
| #endif |
| @@ -268,6 +263,7 @@ template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( |
| uint32_t subsetGlyphIDsLength, |
| bool (*getAdvance)(IDWriteFontFace* fontFace, int gId, int16_t* data)); |
| #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) |
| +typedef struct FT_FaceRec_* FT_Face; |
|
bungeman-skia
2013/04/12 18:16:03
Should forward declare FT_FaceRec. I think you're
|
| template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( |
| FT_Face face, |
| int num_glyphs, |