Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: src/core/SkAdvancedTypefaceMetrics.cpp

Issue 13975014: Remove freetype dependency from core.gyp (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/core.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « gyp/core.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698