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

Unified Diff: src/ports/SkFontConfigTypeface.h

Issue 21331003: adapt FontConfig to use SK_FONTHOST_USES_FONTMGR (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 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 | « src/fonts/SkFontMgr_fontconfig.cpp ('k') | src/ports/SkFontHost_fontconfig.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontConfigTypeface.h
diff --git a/src/ports/SkFontConfigTypeface.h b/src/ports/SkFontConfigTypeface.h
index 549e02f8263f7db54d054a5192f32dae53b3cfc2..e9f9a13c1e2757139e44ac80ab364d9017c12043 100644
--- a/src/ports/SkFontConfigTypeface.h
+++ b/src/ports/SkFontConfigTypeface.h
@@ -7,10 +7,10 @@
#include "SkFontConfigInterface.h"
#include "SkFontHost_FreeType_common.h"
+#include "SkStream.h"
#include "SkTypefaceCache.h"
class SkFontDescriptor;
-class SkStream;
class FontConfigTypeface : public SkTypeface_FreeType {
SkFontConfigInterface::FontIdentity fIdentity;
@@ -48,6 +48,10 @@ public:
return fFamilyName.equals(name);
}
+ static SkTypeface* LegacyCreateTypeface(const SkTypeface* family,
+ const char familyName[],
+ SkTypeface::Style);
+
protected:
friend class SkFontHost; // hack until we can make public versions
@@ -56,6 +60,7 @@ protected:
size_t length, void* data) const SK_OVERRIDE;
virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
+ virtual SkTypeface* onRefMatchingStyle(Style) const SK_OVERRIDE;
private:
typedef SkTypeface_FreeType INHERITED;
« no previous file with comments | « src/fonts/SkFontMgr_fontconfig.cpp ('k') | src/ports/SkFontHost_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698