Remove SK_IGNORE_SUBPIXEL_EMOJI_FIX.
No longer needed as users have been rebaselined. Change-Id: Ie61d6ab8567685039ba11d9390ea8db8deefa954 Reviewed-on: https://skia-review.googlesource.com/144640 Auto-Submit: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
parent
fd10d170ee
commit
144113774a
@ -595,12 +595,10 @@ void SkScalerContext_DW::generateColorMetrics(SkGlyph* glyph) {
|
||||
bounds.join(path.getBounds());
|
||||
}
|
||||
SkMatrix matrix = fSkXform;
|
||||
#ifndef SK_IGNORE_EMOJI_SUBPIXEL_FIX
|
||||
if (this->isSubpixel()) {
|
||||
matrix.postTranslate(SkFixedToScalar(glyph->getSubXFixed()),
|
||||
SkFixedToScalar(glyph->getSubYFixed()));
|
||||
}
|
||||
#endif
|
||||
matrix.mapRect(&bounds);
|
||||
// Round float bound values into integer.
|
||||
SkIRect ibounds = bounds.roundOut();
|
||||
@ -987,12 +985,10 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
|
||||
|
||||
SkMatrix matrix = fSkXform;
|
||||
matrix.postTranslate(-SkIntToScalar(glyph.fLeft), -SkIntToScalar(glyph.fTop));
|
||||
#ifndef SK_IGNORE_EMOJI_SUBPIXEL_FIX
|
||||
if (this->isSubpixel()) {
|
||||
matrix.postTranslate(SkFixedToScalar(glyph.getSubXFixed()),
|
||||
SkFixedToScalar(glyph.getSubYFixed()));
|
||||
}
|
||||
#endif
|
||||
SkRasterClip rc(SkIRect::MakeWH(glyph.fWidth, glyph.fHeight));
|
||||
SkDraw draw;
|
||||
draw.fDst = SkPixmap(SkImageInfo::MakeN32(glyph.fWidth, glyph.fHeight, kPremul_SkAlphaType),
|
||||
|
Loading…
Reference in New Issue
Block a user