diff options
author | reed <reed@google.com> | 2016-04-11 07:51:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-11 07:51:07 -0700 |
commit | c79172857c3f69cc46837e1beeae0c1ead377bb2 (patch) | |
tree | 4e6eebf5b3b09e91c58287875d24f75d62850818 /include/core/SkTypeface.h | |
parent | 6dc14aab5ea6be87b5b10f17a19737f586708768 (diff) |
Pass effects directly to fontcache
BUG=skia:5176
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1863013003
Review URL: https://codereview.chromium.org/1863013003
Diffstat (limited to 'include/core/SkTypeface.h')
-rw-r--r-- | include/core/SkTypeface.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 0b1ca6a4bd..0fbf6a3e0a 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkTypeface_DEFINED #define SkTypeface_DEFINED @@ -21,6 +19,7 @@ class SkFontData; class SkFontDescriptor; class SkScalerContext; struct SkScalerContextRec; +struct SkScalerContextEffects; class SkStream; class SkStreamAsset; class SkAdvancedTypefaceMetrics; @@ -295,7 +294,7 @@ public: * if allowFailure is true, this returns NULL, else it returns a * dummy scalercontext that will not crash, but will draw nothing. */ - SkScalerContext* createScalerContext(const SkDescriptor*, + SkScalerContext* createScalerContext(const SkScalerContextEffects&, const SkDescriptor*, bool allowFailure = false) const; /** @@ -336,7 +335,8 @@ protected: friend class SkScalerContext; static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal); - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0; + virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, + const SkDescriptor*) const = 0; virtual void onFilterRec(SkScalerContextRec*) const = 0; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, |