diff options
author | Herb Derby <herb@google.com> | 2018-07-26 16:54:18 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-27 03:13:56 +0000 |
commit | b935cf8e12d7371246d318f20f4ebf88e321573a (patch) | |
tree | 4af6fce01d981c24e16c5adfd92680d49199988e /src/core/SkDevice.cpp | |
parent | 5f1dc76d0ceceb97796ec1626e59fe8d4ede581c (diff) |
const all the things
Having the glyph run list be const as it passes through the stack means
that future change can't be introduced in the device code that changes
behavior. Try to force all text changes into the SkGylphRun system.
Change-Id: I9412bc094c7adb8554887c725a6264af306e1d42
Reviewed-on: https://skia-review.googlesource.com/143702
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/core/SkDevice.cpp')
-rw-r--r-- | src/core/SkDevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index b94d7e97cf..f0829dc4da 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -158,7 +158,7 @@ void SkBaseDevice::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, SkGlyphRunBuilder builder; builder.drawText(runPaint, (const char*) it.glyphs(), textLen, origin); auto glyphRunList = builder.useGlyphRunList(); - glyphRunList->temporaryShuntToDrawPosText(this, SkPoint::Make(0, 0)); + glyphRunList.temporaryShuntToDrawPosText(this, SkPoint::Make(0, 0)); } break; case SkTextBlob::kHorizontal_Positioning: @@ -239,8 +239,8 @@ void SkBaseDevice::drawImageLattice(const SkImage* image, } } -void SkBaseDevice::drawGlyphRunList(SkGlyphRunList* glyphRunList) { - glyphRunList->temporaryShuntToDrawPosText(this, SkPoint::Make(0, 0)); +void SkBaseDevice::drawGlyphRunList(const SkGlyphRunList& glyphRunList) { + glyphRunList.temporaryShuntToDrawPosText(this, SkPoint::Make(0, 0)); } void SkBaseDevice::drawBitmapLattice(const SkBitmap& bitmap, @@ -491,7 +491,7 @@ void SkBaseDevice::drawGlyphRunRSXform(SkGlyphRun* run, const SkRSXform* xform) ctm.setConcat(originalCTM, ctm); this->setCTM(ctm); SkGlyphRunList glyphRunList{glyphRun}; - this->drawGlyphRunList(&glyphRunList); + this->drawGlyphRunList(glyphRunList); }; run->eachGlyphToGlyphRun(perGlyph); run->mutablePaint()->setShader(shader); |