From 148c78f825496b75a812d61e7d9222d897870a6c Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Fri, 2 Oct 2015 14:19:39 -0700 Subject: Don't unregister Fonts from renderer at destruction bug:24584749 Fonts are only destroyed when the renderer is destroyed, this prevents modifying the FontRenderer's LruCache while it's being iterated through in FontRenderer::~FontRenderer. Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e --- libs/hwui/FontRenderer.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libs/hwui/FontRenderer.cpp') diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index bc75daba44c0..c9c5550ac009 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -722,14 +722,6 @@ bool FontRenderer::renderTextOnPath(const SkPaint* paint, const Rect* clip, cons return mDrawn; } -void FontRenderer::removeFont(const Font* font) { - mActiveFonts.remove(font->getDescription()); - - if (mCurrentFont == font) { - mCurrentFont = NULL; - } -} - void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, float radius) { uint32_t intRadius = Blur::convertRadiusToInt(radius); #ifdef ANDROID_ENABLE_RENDERSCRIPT -- cgit v1.2.3-59-g8ed1b