diff options
author | brianosman <brianosman@google.com> | 2016-04-08 06:47:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-08 06:47:54 -0700 |
commit | a1e8f8d8f1a0b7141136d7d49df1cc2fec0528df (patch) | |
tree | 9249c051645ac31322729f11d3caa4c619aa7b73 /src/gpu/text/GrTextUtils.h | |
parent | b63c5766c3dece300167b41c5c4e30b7b330dfaa (diff) |
Decouple contrast boost from fake gamma.
Replace FakeGamma with FontWeightFlags. Largely mechanical, except for
the changes in ignorePreBlend. With this change, text GMs generally look
the same (or at least more similar) in 8888/srgb/gpu/gpusrgb configs.
No public API changes.
TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1866293003
Review URL: https://codereview.chromium.org/1866293003
Diffstat (limited to 'src/gpu/text/GrTextUtils.h')
-rw-r--r-- | src/gpu/text/GrTextUtils.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h index 52b3ab4c54..7823473f77 100644 --- a/src/gpu/text/GrTextUtils.h +++ b/src/gpu/text/GrTextUtils.h @@ -38,13 +38,13 @@ public: static void DrawBmpText(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, - GrColor, SkPaint::FakeGamma, const SkMatrix& viewMatrix, + GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y); static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, - GrColor, SkPaint::FakeGamma, const SkMatrix& viewMatrix, + GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset); @@ -55,14 +55,15 @@ public: static void DrawDFText(GrAtlasTextBlob* blob, int runIndex, GrBatchFontCache*, const SkSurfaceProps&, - const SkPaint& skPaint, GrColor color, SkPaint::FakeGamma, + const SkPaint& skPaint, GrColor color, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y); static void DrawDFPosText(GrAtlasTextBlob* blob, int runIndex, GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, - GrColor color, SkPaint::FakeGamma, const SkMatrix& viewMatrix, + GrColor color, uint32_t scalerContextFlags, + const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset); |