diff options
| author |  reed <reed@google.com> | 2016-04-12 06:47:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-12 06:47:05 -0700 |
| commit | a9322c2d86aaef1085c267dfc43cf0747f170a86 (patch) | |
| tree | 6af9e63ea49c092cb76bd0dfa482a03b82444911 /include/core/SkTypeface.h | |
| parent | ac8681b0a1f0a5b55df059d75c4112bf411ba8b5 (diff) | |
Revert "Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.chromium.org/1863013003/ )"
add SK_SUPPORT_NEW_ONCREATESCALERCONTEXT for chrome
this has now landed https://codereview.chromium.org/1878913002/
TBR=
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1880873002
Review URL: https://codereview.chromium.org/1880873002
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 0b1ca6a4bd..f8cd4d1090 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 @@ -16,11 +14,14 @@ #include "SkRect.h" #include "SkString.h" +#define SK_SUPPORT_NEW_ONCREATESCALERCONTEXT + class SkDescriptor; class SkFontData; class SkFontDescriptor; class SkScalerContext; struct SkScalerContextRec; +struct SkScalerContextEffects; class SkStream; class SkStreamAsset; class SkAdvancedTypefaceMetrics; @@ -295,7 +296,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 +337,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, |