Merge "Text would disappear when the font size is 75px. Bug #5230196" (853921fa) · Commits · e / os / android_frameworks_base

libs/hwui/FontRenderer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -394,14 +394,14 @@ void FontRenderer::flushAllAndInvalidate() {

		bool FontRenderer::cacheBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY) {
		// If the glyph is too tall, don't cache it
		if (glyph.fHeight > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {
		if (glyph.fHeight + 2 > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {
		if (mCacheHeight < MAX_TEXT_CACHE_HEIGHT) {
		// Default cache not large enough for large glyphs - resize cache to
		// max size and try again
		flushAllAndInvalidate();
		initTextTexture(true);
		}
		if (glyph.fHeight > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {
		if (glyph.fHeight + 2 > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {
		LOGE("Font size to large to fit in cache. width, height = %i, %i",
		(int) glyph.fWidth, (int) glyph.fHeight);
		return false;