diff options
| author |  Herb Derby <herb@google.com> | 2018-01-22 14:39:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 18:13:36 +0000 |
| commit | d8327a8c8bad870112b574c4533270370f5c1ccf (patch) | |
| tree | f62b2e9f47f60bf0eb2cbcddb9686ad2cf9fee03 /src/core/SkDraw.cpp | |
| parent | 0331d37af9656e2e7c5dd1d79cb12396d51a19e9 (diff) | |
Clean up SkScalerContext descriptor creation
Allow a descriptor creation using just a rec and effects.
This is the most complex part of the change.
Cleanup SkScalerContextFlags to be a real thing.
This has spread everywhere.
BUG=skia:7515
Change-Id: I67189c9aeb51f1777a1c60145216524d440cb890
Reviewed-on: https://skia-review.googlesource.com/98320
Commit-Queue: Herb Derby <herb@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkDraw.cpp')
| -rw-r--r-- | src/core/SkDraw.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 3c8aa1c1f7..20ce379cd6 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -26,6 +26,7 @@ #include "SkRasterClip.h" #include "SkRectPriv.h" #include "SkRRect.h" +#include "SkScalerContext.h" #include "SkScan.h" #include "SkShader.h" #include "SkString.h" @@ -1495,10 +1496,10 @@ private: //////////////////////////////////////////////////////////////////////////////////////////////////// -uint32_t SkDraw::scalerContextFlags() const { - uint32_t flags = SkPaint::kBoostContrast_ScalerContextFlag; +SkScalerContextFlags SkDraw::scalerContextFlags() const { + SkScalerContextFlags flags = SkScalerContextFlags::kBoostContrast; if (!fDst.colorSpace()) { - flags |= SkPaint::kFakeGamma_ScalerContextFlag; + flags = kFakeGammaAndBoostContrast; } return flags; } |