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/GrAtlasTextBlob.cpp | |
| 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/GrAtlasTextBlob.cpp')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index 62591f87b0..4b339d4adb 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -51,7 +51,7 @@ GrAtlasTextBlob* GrAtlasTextBlob::Create(GrMemoryPool* pool, int glyphCount, int SkGlyphCache* GrAtlasTextBlob::setupCache(int runIndex, const SkSurfaceProps& props, - SkPaint::FakeGamma fakeGamma, + uint32_t scalerContextFlags, const SkPaint& skPaint, const SkMatrix* viewMatrix) { GrAtlasTextBlob::Run* run = &fRuns[runIndex]; @@ -59,7 +59,7 @@ SkGlyphCache* GrAtlasTextBlob::setupCache(int runIndex, // if we have an override descriptor for the run, then we should use that SkAutoDescriptor* desc = run->fOverrideDescriptor.get() ? run->fOverrideDescriptor.get() : &run->fDescriptor; - skPaint.getScalerContextDescriptor(desc, props, fakeGamma, viewMatrix); + skPaint.getScalerContextDescriptor(desc, props, scalerContextFlags, viewMatrix); run->fTypeface.reset(SkSafeRef(skPaint.getTypeface())); return SkGlyphCache::DetachCache(run->fTypeface, desc->getDesc()); } |