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

Commit 3c07e21b authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Use run based APIs for iterating fonts 

Bug: 361260253
Test: TreeHugger
Flag: com.android.text.flags.typeface_redesign
Change-Id: I364c32a19680f4eb0dd992282f13ff2733078bf9
parent 7477c179

libs/hwui/FeatureFlags.h

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ inline bool letter_spacing_justification() { 
#endif  // __ANDROID__

}



inline bool typeface_redesign() {

#ifdef __ANDROID__

    static bool flag = com_android_text_flags_typeface_redesign();

    return flag;

#else

    return true;

#endif  // __ANDROID__

}



}  // namespace text_feature



}  // namespace android

libs/hwui/hwui/MinikinUtils.h

+33 −16
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <cutils/compiler.h>

#include <log/log.h>

#include <minikin/Layout.h>



#include "FeatureFlags.h"

#include "MinikinSkia.h"

#include "Paint.h"

#include "Typeface.h"
@@ -71,6 +73,20 @@ public: 
    static void forFontRun(const minikin::Layout& layout, Paint* paint, F& f) {

        float saveSkewX = paint->getSkFont().getSkewX();

        bool savefakeBold = paint->getSkFont().isEmbolden();

        if (text_feature::typeface_redesign()) {

            for (uint32_t runIdx = 0; runIdx < layout.getFontRunCount(); ++runIdx) {

                uint32_t start = layout.getFontRunStart(runIdx);

                uint32_t end = layout.getFontRunEnd(runIdx);

                const minikin::FakedFont& fakedFont = layout.getFontRunFont(runIdx);



                std::shared_ptr<minikin::MinikinFont> font = fakedFont.typeface();

                SkFont* skfont = &paint->getSkFont();

                MinikinFontSkia::populateSkFont(skfont, font.get(), fakedFont.fakery);

                f(start, end);

                skfont->setSkewX(saveSkewX);

                skfont->setEmbolden(savefakeBold);

            }

        } else {

            const minikin::MinikinFont* curFont = nullptr;

            size_t start = 0;

            size_t nGlyphs = layout.nGlyphs();
@@ -94,6 +110,7 @@ public: 
                skfont->setEmbolden(savefakeBold);

            }

        }

    }

};



}  // namespace android