From 74c6ed3d1f179209ec90025532310d9c8151999f Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Sat, 28 Jul 2018 18:07:54 -0400 Subject: Move one leaf loop from GPU to glyph drawer Encapsulate the bitmap inner loop of regenerate in the SkGlyphRunListDrawer. This changed required placing an SkGlyphRunListDrawer in the two TextTargets. Change-Id: I7ef7a2d0074fe898fce4da82d26ea1f47e1f7a98 Reviewed-on: https://skia-review.googlesource.com/144302 Reviewed-by: Jim Van Verth Reviewed-by: Brian Salomon Commit-Queue: Herb Derby --- src/core/SkDraw.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/SkDraw.cpp') diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 95942f76a8..b35d7f9f4c 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1579,7 +1579,7 @@ SkGlyphRunListDrawer::PerMask SkDraw::drawOneMaskCreator( auto useRegion = fRC->isBW() && !fRC->isRect(); if (useRegion) { - return [this, blitter, &paint](const SkMask& mask) { + return [this, blitter, &paint](const SkMask& mask, const SkGlyph&, SkPoint) { SkRegion::Cliperator clipper(fRC->bwRgn(), mask.fBounds); if (!clipper.done()) { @@ -1597,7 +1597,7 @@ SkGlyphRunListDrawer::PerMask SkDraw::drawOneMaskCreator( } else { SkIRect clipBounds = fRC->isBW() ? fRC->bwRgn().getBounds() : fRC->aaRgn().getBounds(); - return [this, blitter, clipBounds, &paint](const SkMask& mask) { + return [this, blitter, clipBounds, &paint](const SkMask& mask, const SkGlyph&, SkPoint) { SkIRect storage; const SkIRect* bounds = &mask.fBounds; @@ -1639,7 +1639,7 @@ void SkDraw::drawGlyphRunList( return this->drawOneMaskCreator(paint, alloc); }; - glyphDraw->drawForBitmap(glyphRunList, *fMatrix, perMaskBuilder, perPathBuilder); + glyphDraw->drawForBitmapDevice(glyphRunList, *fMatrix, perMaskBuilder, perPathBuilder); } #if defined _WIN32 -- cgit v1.2.3