Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for bd57dac5 to stage-aosp-master

Browse Source 
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
This commit is contained in:
Stephen Hines
2015-10-02 17:34:05 -07:00
parent 5fbb245230 bd57dac5d5
commit ee144b1e60
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/FontRenderer.cpp
View File

@@ -681,14 +681,6 @@ bool FontRenderer::renderTextOnPath(const SkPaint* paint, const Rect* clip, cons
return mDrawn; return mDrawn;
} }
void FontRenderer::removeFont(const Font* font) {
mActiveFonts.remove(font->getDescription());
if (mCurrentFont == font) {
mCurrentFont = nullptr;
}
}
void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, float radius) { void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, float radius) {
uint32_t intRadius = Blur::convertRadiusToInt(radius); uint32_t intRadius = Blur::convertRadiusToInt(radius);
#ifdef ANDROID_ENABLE_RENDERSCRIPT #ifdef ANDROID_ENABLE_RENDERSCRIPT

2
libs/hwui/FontRenderer.h
View File

@@ -151,8 +151,6 @@ private:
float x3, float y3, float u3, float v3, float x3, float y3, float u3, float v3,
float x4, float y4, float u4, float v4, CacheTexture* texture); float x4, float y4, float u4, float v4, CacheTexture* texture);
void removeFont(const Font* font);
void checkTextureUpdate(); void checkTextureUpdate();
void setTextureDirty() { void setTextureDirty() {

2
libs/hwui/font/Font.cpp
View File

@@ -64,8 +64,6 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const SkMatrix& ras
} }
Font::~Font() { Font::~Font() {
mState->removeFont(this);
for (uint32_t i = 0; i < mCachedGlyphs.size(); i++) { for (uint32_t i = 0; i < mCachedGlyphs.size(); i++) {
delete mCachedGlyphs.valueAt(i); delete mCachedGlyphs.valueAt(i);
} }