diff options
author | Herb Derby <herb@google.com> | 2018-03-09 10:15:52 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-09 16:19:40 +0000 |
commit | c2ef4ab423b0cc456425de1f0161e24980652db6 (patch) | |
tree | 2e1f6d71c9bbe560120374f38a73014260b5ccf0 /src/core/SkPaint.cpp | |
parent | 03cd6e6dec894b3447527f84e7591d62981df433 (diff) |
Remove all uses of getCache with get.
Holding off on removing definition until android cleans
up its code.
Change-Id: I19cce13d6d1f10f172770a926966761686bc7d6a
Reviewed-on: https://skia-review.googlesource.com/113168
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core/SkPaint.cpp')
-rw-r--r-- | src/core/SkPaint.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index e3680713b5..1fd3bf55db 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -431,7 +431,7 @@ int SkPaint::textToGlyphs(const void* textData, size_t byteLength, uint16_t glyp } SkAutoGlyphCache autoCache(*this, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); const char* text = (const char*)textData; const char* stop = text + byteLength; @@ -489,7 +489,7 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const { } SkAutoGlyphCache autoCache(*this, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); switch (this->getTextEncoding()) { case SkPaint::kUTF8_TextEncoding: { @@ -539,7 +539,7 @@ void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count, SkUnichar tex SkSurfaceProps props(0, kUnknown_SkPixelGeometry); SkAutoGlyphCache autoCache(*this, &props, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); for (int index = 0; index < count; index++) { textData[index] = cache->glyphToUnichar(glyphs[index]); @@ -805,7 +805,7 @@ SkScalar SkPaint::measureText(const void* textData, size_t length, SkRect* bound SkScalar scale = canon.getScale(); SkAutoGlyphCache autoCache(paint, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); SkScalar width = 0; @@ -859,7 +859,7 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth, } SkAutoGlyphCache autoCache(paint, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); GlyphCacheProc glyphCacheProc = SkPaint::GetGlyphCacheProc(paint.getTextEncoding(), paint.isDevKernText(), @@ -965,7 +965,7 @@ int SkPaint::getTextWidths(const void* textData, size_t byteLength, SkScalar scale = canon.getScale(); SkAutoGlyphCache autoCache(paint, nullptr, nullptr); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); GlyphCacheProc glyphCacheProc = SkPaint::GetGlyphCacheProc(paint.getTextEncoding(), paint.isDevKernText(), nullptr != bounds); |