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

Use rect calls in SkFont

Browse Source 
Change-Id: Ib51519180136f8907f418808c96a01d403dcf7a5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223799
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2019-06-25 16:25:20 -04:00 committed by Skia Commit-Bot
parent 3aada98db5
commit 4e2033e843
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/SkFont.cpp
View File

@ -210,17 +210,13 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
}
static void set_bounds(const SkGlyph& g, SkRect* bounds) {
bounds->set(SkIntToScalar(g.fLeft),
SkIntToScalar(g.fTop),
SkIntToScalar(g.fLeft + g.fWidth),
SkIntToScalar(g.fTop + g.fHeight));
*bounds = g.rect();
}
static void join_bounds_x(const SkGlyph& g, SkRect* bounds, SkScalar dx) {
bounds->join(SkIntToScalar(g.fLeft) + dx,
SkIntToScalar(g.fTop),
SkIntToScalar(g.fLeft + g.fWidth) + dx,
SkIntToScalar(g.fTop + g.fHeight));
SkRect r = g.rect();
r.offset(dx, 0);
bounds->join(r);
}
namespace {
@ -278,12 +274,7 @@ SkScalar SkFont::measureText(const void* text, size_t length, SkTextEncoding enc
}
static SkRect make_bounds(const SkGlyph& g, SkScalar scale) {
return {
g.fLeft * scale,
g.fTop * scale,
(g.fLeft + g.fWidth) * scale,
(g.fTop + g.fHeight) * scale
};
return SkMatrix::MakeScale(scale).mapRect(g.rect());
}
template <typename HANDLER>