Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee144b1e authored by Stephen Hines's avatar Stephen Hines
Browse files

resolved conflicts for bd57dac5 to stage-aosp-master 

Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
parents 5fbb2452 bd57dac5

libs/hwui/FontRenderer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -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

libs/hwui/FontRenderer.h

+0 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ private: 
            float x3, float y3, float u3, float v3,

            float x4, float y4, float u4, float v4, CacheTexture* texture);



    void removeFont(const Font* font);



    void checkTextureUpdate();



    void setTextureDirty() {

libs/hwui/font/Font.cpp

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const SkMatrix& ras 
}



Font::~Font() {

    mState->removeFont(this);



    for (uint32_t i = 0; i < mCachedGlyphs.size(); i++) {

        delete mCachedGlyphs.valueAt(i);

    }