From 0ab5ce151c4507966c135ab3986cf2b28b36d6c6 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 30 Jul 2018 10:10:40 -0400 Subject: 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 Commit-Queue: Herb Derby --- src/core/SkGlyphRun.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/SkGlyphRun.h') diff --git a/src/core/SkGlyphRun.h b/src/core/SkGlyphRun.h index 6bdc633091..7f9307292c 100644 --- a/src/core/SkGlyphRun.h +++ b/src/core/SkGlyphRun.h @@ -119,21 +119,21 @@ public: using PerMask = std::function; using PerMaskCreator = std::function; - using PerPath = std::function; - using PerPathCreator = std::function; + using PerPath = std::function; + using PerPathCreator = std::function; void drawForBitmapDevice( const SkGlyphRunList& glyphRunList, const SkMatrix& deviceMatrix, PerMaskCreator perMaskCreator, PerPathCreator perPathCreator); void drawUsingMasks( SkGlyphCache* cache, const SkGlyphRun& glyphRun, SkPoint origin, const SkMatrix& deviceMatrix, PerMask perMask); + void drawUsingPaths( + const SkGlyphRun& glyphRun, SkPoint origin, SkGlyphCache* cache, PerPath perPath) const; private: static bool ShouldDrawAsPath(const SkPaint& paint, const SkMatrix& matrix); bool ensureBitmapBuffers(size_t runSize); - void drawUsingPaths( - const SkGlyphRun& glyphRun, SkPoint origin, - const SkSurfaceProps& props, PerPath perPath) const; void drawGlyphRunAsSubpixelMask( SkGlyphCache* cache, const SkGlyphRun& glyphRun, SkPoint origin, const SkMatrix& deviceMatrix, -- cgit v1.2.3