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

Commit 3744a64a authored by Raph Levien's avatar Raph Levien
Browse files

Use Minikin's purgeCaches 

In USE_MINIKIN builds, purge the Minikin caches rather than the
TextLayout caches.

Change-Id: Id6bf9db38488ed5023a61feab88004511393644c
parent 39e7a545

core/jni/android/graphics/Canvas.cpp

+4 −0
Original line number Diff line number Diff line
@@ -301,7 +301,11 @@ public: 
    }



    static void freeTextLayoutCaches(JNIEnv* env, jobject) {

#ifdef USE_MINIKIN

        Layout::purgeCaches();

#else

        TextLayoutEngine::getInstance().purgeCaches();

#endif

    }



    static jboolean isOpaque(JNIEnv*, jobject, jlong canvasHandle) {

core/jni/android/graphics/MinikinUtils.cpp

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ std::string MinikinUtils::setLayoutProperties(Layout* layout, const SkPaint* pai 
    SkPaintOptionsAndroid::FontVariant var = paint->getPaintOptionsAndroid().getFontVariant();

    const char* varstr = var == SkPaintOptionsAndroid::kElegant_Variant ? "elegant" : "compact";

    off = snprintfcat(css, off, sizeof(css), " -minikin-variant: %s;", varstr);

    layout->setProperties(css);

    return std::string(css);

}