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

Commit 8530259b authored by Kevin Lubick's avatar Kevin Lubick Committed by Android (Google) Code Review
Browse files

Merge "[base] Replace SkFontMgr::RefDefault() with FreeTypeFontMgr" into main

parents a9036f57 04931014

libs/hwui/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -553,6 +553,7 @@ cc_defaults { 
        "utils/Blur.cpp",

        "utils/Blur.cpp",

        "utils/Color.cpp",

        "utils/Color.cpp",

        "utils/LinearAllocator.cpp",

        "utils/LinearAllocator.cpp",

        "utils/TypefaceUtils.cpp",

        "utils/VectorDrawableUtils.cpp",

        "utils/VectorDrawableUtils.cpp",

        "AnimationContext.cpp",

        "AnimationContext.cpp",

        "Animator.cpp",

        "Animator.cpp",

libs/hwui/hwui/MinikinSkia.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <minikin/MinikinExtent.h>

#include <minikin/MinikinExtent.h>

#include <minikin/MinikinPaint.h>

#include <minikin/MinikinPaint.h>

#include <minikin/MinikinRect.h>

#include <minikin/MinikinRect.h>

#include <utils/TypefaceUtils.h>





namespace android {

namespace android {
@@ -142,7 +143,7 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( 
        skVariation[i].value = SkFloatToScalar(variations[i].value);

        skVariation[i].value = SkFloatToScalar(variations[i].value);

    }

    }

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});

    sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(stream), args));

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(stream), args));





    return std::make_shared<MinikinFontSkia>(std::move(face), mSourceId, mFontData, mFontSize,

    return std::make_shared<MinikinFontSkia>(std::move(face), mSourceId, mFontData, mFontSize,

libs/hwui/jni/FontFamily.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <minikin/FontFamily.h>

#include <minikin/FontFamily.h>

#include <minikin/LocaleList.h>

#include <minikin/LocaleList.h>

#include <ui/FatVector.h>

#include <ui/FatVector.h>

#include <utils/TypefaceUtils.h>





#include <memory>

#include <memory>
@@ -125,7 +126,7 @@ static bool addSkTypeface(NativeFamilyBuilder* builder, sk_sp<SkData>&& data, in 
    args.setCollectionIndex(ttcIndex);

    args.setCollectionIndex(ttcIndex);

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});





    sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(fontData), args));

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(fontData), args));

    if (face == NULL) {

    if (face == NULL) {

        ALOGE("addFont failed to create font, invalid request");

        ALOGE("addFont failed to create font, invalid request");

libs/hwui/jni/fonts/Font.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <minikin/LocaleList.h>

#include <minikin/LocaleList.h>

#include <minikin/SystemFonts.h>

#include <minikin/SystemFonts.h>

#include <ui/FatVector.h>

#include <ui/FatVector.h>

#include <utils/TypefaceUtils.h>





#include <memory>

#include <memory>
@@ -459,7 +460,7 @@ std::shared_ptr<minikin::MinikinFont> createMinikinFontSkia( 
    args.setCollectionIndex(ttcIndex);

    args.setCollectionIndex(ttcIndex);

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});

    args.setVariationDesignPosition({skVariation.data(), static_cast<int>(skVariation.size())});





    sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(fontData), args));

    sk_sp<SkTypeface> face(fm->makeFromStream(std::move(fontData), args));

    if (face == nullptr) {

    if (face == nullptr) {

        return nullptr;

        return nullptr;

libs/hwui/tests/unit/TypefaceTests.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




#include "hwui/MinikinSkia.h"

#include "hwui/MinikinSkia.h"

#include "hwui/Typeface.h"

#include "hwui/Typeface.h"

#include "utils/TypefaceUtils.h"





using namespace android;

using namespace android;
@@ -56,7 +57,7 @@ std::shared_ptr<minikin::FontFamily> buildFamily(const char* fileName) { 
    sk_sp<SkData> skData =

    sk_sp<SkData> skData =

            SkData::MakeWithProc(data, st.st_size, unmap, reinterpret_cast<void*>(st.st_size));

            SkData::MakeWithProc(data, st.st_size, unmap, reinterpret_cast<void*>(st.st_size));

    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(skData));

    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(skData));

    sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

    sk_sp<SkFontMgr> fm = android::FreeTypeFontMgr();

    sk_sp<SkTypeface> typeface(fm->makeFromStream(std::move(fontData)));

    sk_sp<SkTypeface> typeface(fm->makeFromStream(std::move(fontData)));

    LOG_ALWAYS_FATAL_IF(typeface == nullptr, "Failed to make typeface from %s", fileName);

    LOG_ALWAYS_FATAL_IF(typeface == nullptr, "Failed to make typeface from %s", fileName);

    std::shared_ptr<minikin::MinikinFont> font =

    std::shared_ptr<minikin::MinikinFont> font =