diff options
author | 2015-09-09 07:22:09 -0700 | |
---|---|---|
committer | 2015-09-09 07:22:09 -0700 | |
commit | d9b8d7ac1fb4628f3411253c0fc6cd37e4ff0487 (patch) | |
tree | 0fb1483f5d9a875bd6349aa1ea8cf3e09cefa132 /include/core/SkPaint.h | |
parent | 2ac6793efc9b33f6104f9c39810bee5714bdc208 (diff) |
Revert of Make SkGraphics::Term a no-op, stop calling it. (patchset #2 id:20001 of https://codereview.chromium.org/1329853005/ )
Reason for revert:
SK_ATTR_DEPRECATED is meaningful to Android. Don't use it.
Original issue's description:
> Make SkGraphics::Term a no-op, stop calling it.
>
> I'd remove it entirely but Android is calling it explicitly.
>
> BUG=skia:4259
>
> Committed: https://skia.googlesource.com/skia/+/925979f733fe8e70d84627147dee04d030423349
TBR=reed@google.com,scroggo@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4259
Review URL: https://codereview.chromium.org/1314483006
Diffstat (limited to 'include/core/SkPaint.h')
-rw-r--r-- | include/core/SkPaint.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 2090ed2337..0c071ad361 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -289,7 +289,7 @@ public: SkFilterQuality getFilterQuality() const { return (SkFilterQuality)fBitfields.fFilterQuality; } - + /** * Set the filter quality. This affects the quality (and performance) of * drawing scaled images. @@ -1046,6 +1046,8 @@ private: */ SkColor computeLuminanceColor() const; + static void Term(); + enum { /* This is the size we use when we ask for a glyph's path. We then * post-transform it as we draw to match the request. @@ -1088,6 +1090,7 @@ private: friend class SkAutoGlyphCacheNoGamma; friend class SkCanvas; friend class SkDraw; + friend class SkGraphics; // So Term() can be called. friend class SkPDFDevice; friend class GrBitmapTextContext; friend class GrAtlasTextContext; |