diff options
| author | 2015-10-02 17:34:05 -0700 | |
|---|---|---|
| committer | 2015-10-02 17:34:05 -0700 | |
| commit | ee144b1e60a88e8f097113e046813f0b61c38b9b (patch) | |
| tree | 0d9fd819c4ac355e3228473fde24b4abc3f24e5f /libs/hwui/FontRenderer.cpp | |
| parent | 5fbb245230317b5ca312556b73380195871827eb (diff) | |
| parent | bd57dac5d5b99d7f6bead50f327b488d464521df (diff) | |
resolved conflicts for bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 9c2c1192a69d..9a2a879e594e 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -681,14 +681,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 = nullptr; - } -} - void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, float radius) { uint32_t intRadius = Blur::convertRadiusToInt(radius); #ifdef ANDROID_ENABLE_RENDERSCRIPT |