diff options
author | Herb Derby <herb@google.com> | 2018-07-30 10:10:40 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-31 20:51:18 +0000 |
commit | 0ab5ce151c4507966c135ab3986cf2b28b36d6c6 (patch) | |
tree | 42fac4dd57f2027f027be03f43343059f27b30af /src/core/SkGlyphRun.cpp | |
parent | a83bb57bfe2be07a7fb60cd01417e8c69e77e967 (diff) |
Move path leaf loop to drawer
This CL makes GPU and Raster use the same path drawing interface. When
I get the main body of regenerate over into the glyph run system, I
I can refactor a lot of annoyingly similar code away.
Change-Id: I6bd2e6119570062695d6943565749d85555b03fa
Reviewed-on: https://skia-review.googlesource.com/144350
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core/SkGlyphRun.cpp')
-rw-r--r-- | src/core/SkGlyphRun.cpp | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/src/core/SkGlyphRun.cpp b/src/core/SkGlyphRun.cpp index 1a24c3bdb9..7bb452a449 100644 --- a/src/core/SkGlyphRun.cpp +++ b/src/core/SkGlyphRun.cpp @@ -163,38 +163,16 @@ bool SkGlyphRunListDrawer::ensureBitmapBuffers(size_t runSize) { } void SkGlyphRunListDrawer::drawUsingPaths( - const SkGlyphRun& glyphRun, SkPoint origin, - const SkSurfaceProps& props, PerPath perPath) const { - // setup our std paint, in hopes of getting hits in the cache - const SkPaint& origPaint = glyphRun.paint(); - SkPaint paint(glyphRun.paint()); - SkScalar matrixScale = paint.setupForAsPaths(); + const SkGlyphRun& glyphRun, SkPoint origin, SkGlyphCache* cache, PerPath perPath) const { - SkMatrix matrix; - matrix.setScale(matrixScale, matrixScale); - - // Temporarily jam in kFill, so we only ever ask for the raw outline from the cache. - paint.setStyle(SkPaint::kFill_Style); - paint.setPathEffect(nullptr); - - auto cache = SkStrikeCache::FindOrCreateStrikeExclusive( - paint, &props, fScalerContextFlags, nullptr); - - // Now restore the original settings, so we "draw" with whatever style/stroking. - paint.setStyle(origPaint.getStyle()); - paint.setPathEffect(origPaint.refPathEffect()); - - auto eachGlyph = [perPath{std::move(perPath)}, origin, &cache, &matrix] + auto eachGlyph = + [perPath{std::move(perPath)}, origin, &cache] (SkGlyphID glyphID, SkPoint position) { const SkGlyph& glyph = cache->getGlyphIDMetrics(glyphID); if (glyph.fWidth > 0) { const SkPath* path = cache->findPath(glyph); - if (path != nullptr) { - SkPoint loc = position + origin; - matrix[SkMatrix::kMTransX] = loc.fX; - matrix[SkMatrix::kMTransY] = loc.fY; - perPath(*path, matrix); - } + SkPoint loc = position + origin; + perPath(path, glyph, loc); } }; @@ -319,8 +297,20 @@ void SkGlyphRunListDrawer::drawForBitmapDevice( : fBitmapFallbackProps; auto paint = glyphRun.paint(); if (ShouldDrawAsPath(glyphRun.paint(), deviceMatrix)) { - auto perPath = perPathCreator(paint, &alloc); - this->drawUsingPaths(glyphRun, origin, props, perPath); + + // setup our std pathPaint, in hopes of getting hits in the cache + SkPaint pathPaint(glyphRun.paint()); + SkScalar matrixScale = pathPaint.setupForAsPaths(); + + // Temporarily jam in kFill, so we only ever ask for the raw outline from the cache. + pathPaint.setStyle(SkPaint::kFill_Style); + pathPaint.setPathEffect(nullptr); + + auto pathCache = SkStrikeCache::FindOrCreateStrikeExclusive( + pathPaint, &props, fScalerContextFlags, nullptr); + + auto perPath = perPathCreator(paint, matrixScale, &alloc); + this->drawUsingPaths(glyphRun, origin, pathCache.get(), perPath); } else { auto cache = SkStrikeCache::FindOrCreateStrikeExclusive( paint, &props, fScalerContextFlags, &deviceMatrix); |