diff options
| author |  borenet <borenet@google.com> | 2016-04-11 10:25:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-11 10:25:28 -0700 |
| commit | 25e0a0416e5b37c1e0bef1934dc67ff62e442916 (patch) | |
| tree | 3d172fdc83424f6abc7214979bb05793f5a2c6b0 /include | |
| parent | 29feef80de0af74eb24b703d6675aea1bc17e655 (diff) | |
Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.chromium.org/1863013003/ )
Reason for revert:
Seems to have broken the DEPS roll.
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/c79172857c3f69cc46837e1beeae0c1ead377bb2
TBR=djsollen@google.com,bungeman@google.com,mtklein@google.com,fmalita@chromium.org,msarett@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5176
Review URL: https://codereview.chromium.org/1872253004
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPaint.h | 7 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 7367fc642d..b2be5041f7 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -30,7 +30,6 @@ class SkPath; class SkPathEffect; struct SkPoint; class SkRasterizer; -struct SkScalerContextEffects; class SkShader; class SkSurfaceProps; class SkTypeface; @@ -1100,8 +1099,7 @@ private: * Allocs an SkDescriptor on the heap and return it to the caller as a refcnted * SkData. Caller is responsible for managing the lifetime of this object. */ - void getScalerContextDescriptor(SkScalerContextEffects*, SkAutoDescriptor*, - const SkSurfaceProps& surfaceProps, + void getScalerContextDescriptor(SkAutoDescriptor*, const SkSurfaceProps& surfaceProps, uint32_t scalerContextFlags, const SkMatrix*) const; SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, uint32_t scalerContextFlags, @@ -1109,8 +1107,7 @@ private: void descriptorProc(const SkSurfaceProps* surfaceProps, uint32_t scalerContextFlags, const SkMatrix* deviceMatrix, - void (*proc)(SkTypeface*, const SkScalerContextEffects&, - const SkDescriptor*, void*), + void (*proc)(SkTypeface*, const SkDescriptor*, void*), void* context) const; /* diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 0fbf6a3e0a..0b1ca6a4bd 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -1,3 +1,4 @@ + /* * Copyright 2006 The Android Open Source Project * @@ -5,6 +6,7 @@ * found in the LICENSE file. */ + #ifndef SkTypeface_DEFINED #define SkTypeface_DEFINED @@ -19,7 +21,6 @@ class SkFontData; class SkFontDescriptor; class SkScalerContext; struct SkScalerContextRec; -struct SkScalerContextEffects; class SkStream; class SkStreamAsset; class SkAdvancedTypefaceMetrics; @@ -294,7 +295,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 SkScalerContextEffects&, const SkDescriptor*, + SkScalerContext* createScalerContext(const SkDescriptor*, bool allowFailure = false) const; /** @@ -335,8 +336,7 @@ protected: friend class SkScalerContext; static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal); - virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const = 0; + virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0; virtual void onFilterRec(SkScalerContextRec*) const = 0; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, |