AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use SkFont more

Browse Source 
Bug: skia:
Change-Id: Ic88f04cb8326fd34596d31777cf853866d329d44
Reviewed-on: https://skia-review.googlesource.com/c/175593
Commit-Queue: Florin Malita <fmalita@chromium.org>
Auto-Submit: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Mike Reed 2018-12-07 14:38:20 -05:00 committed by Skia Commit-Bot
parent 85a216ce89
commit 722dd619cb
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/sksg/src/SkSGText.cpp
View File

@ -57,23 +57,7 @@ SkRect Text::onRevalidate(InvalidationController*, const SkMatrix&) {
// 1) SkTextBlob has some trouble computing accurate bounds with alignment.
// 2) SkPaint::Align is slated for deprecation.
// First, convert to glyphIDs.
SkSTArray<256, SkGlyphID, true> glyphs;
glyphs.reset(font.countText(fText.c_str(), fText.size(), kUTF8_SkTextEncoding));
SkAssertResult(font.textToGlyphs(fText.c_str(), fText.size(), kUTF8_SkTextEncoding,
glyphs.begin(), glyphs.count()));
// Next, build the cached blob.
SkTextBlobBuilder builder;
const auto& buf = builder.allocRun(font, glyphs.count(), 0, 0, nullptr);
if (!buf.glyphs) {
fBlob.reset();
return SkRect::MakeEmpty();
}
memcpy(buf.glyphs, glyphs.begin(), glyphs.count() * sizeof(SkGlyphID));
fBlob = builder.make();
fBlob = SkTextBlob::MakeFromText(fText.c_str(), fText.size(), font, kUTF8_SkTextEncoding);
if (!fBlob) {
return SkRect::MakeEmpty();
}