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

Commit 0ca492fb authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Follow minikin header structure changes 

Bug: N/A
Test: minikin_tests
Test: hwui_unit_tests
Change-Id: I2e3fd1a549fe3e9703d2ef93d03a5923005d4caa
parent 0f81f419

core/jni/android/graphics/FontFamily.cpp

+2 −2
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ namespace android { 


struct NativeFamilyBuilder {

    NativeFamilyBuilder(uint32_t langId, int variant)

        : langId(langId), variant(static_cast<minikin::FontFamily::Variant>(variant)) {}

        : langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {}

    uint32_t langId;

    minikin::FontFamily::Variant variant;

    minikin::FamilyVariant variant;

    std::vector<minikin::Font> fonts;

    std::vector<minikin::FontVariation> axes;

};

core/jni/android/graphics/Paint.cpp

+4 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <minikin/GraphemeBreak.h>

#include <minikin/LocaleList.h>

#include <minikin/Measurement.h>

#include <minikin/MinikinPaint.h>

#include <unicode/utf16.h>



#include <cassert>
@@ -594,7 +595,7 @@ namespace PaintGlue { 
        // restore the original settings.

        paint->setTextSkewX(saveSkewX);

        paint->setFakeBoldText(savefakeBold);

        if (paint->getFamilyVariant() == minikin::FontFamily::Variant::ELEGANT) {

        if (paint->getFamilyVariant() == minikin::FamilyVariant::ELEGANT) {

            SkScalar size = paint->getTextSize();

            metrics->fTop = -size * kElegantTop / 2048;

            metrics->fBottom = -size * kElegantBottom / 2048;
@@ -893,13 +894,13 @@ namespace PaintGlue { 


    static jboolean isElegantTextHeight(jlong paintHandle) {

        Paint* obj = reinterpret_cast<Paint*>(paintHandle);

        return obj->getFamilyVariant() == minikin::FontFamily::Variant::ELEGANT;

        return obj->getFamilyVariant() == minikin::FamilyVariant::ELEGANT;

    }



    static void setElegantTextHeight(jlong paintHandle, jboolean aa) {

        Paint* obj = reinterpret_cast<Paint*>(paintHandle);

        obj->setFamilyVariant(

                aa ? minikin::FontFamily::Variant::ELEGANT : minikin::FontFamily::Variant::DEFAULT);

                aa ? minikin::FamilyVariant::ELEGANT : minikin::FamilyVariant::DEFAULT);

    }



    static jfloat getTextSize(jlong paintHandle) {

libs/hwui/hwui/MinikinSkia.cpp

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#include <SkTypeface.h>

#include <log/log.h>



#include <minikin/Font.h>

#include <minikin/MinikinExtent.h>

#include <minikin/MinikinPaint.h>

#include <minikin/MinikinRect.h>



namespace android {



MinikinFontSkia::MinikinFontSkia(sk_sp<SkTypeface> typeface, const void* fontData, size_t fontSize,

libs/hwui/hwui/Paint.h

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <string>



#include <minikin/FontFamily.h>

#include <minikin/FamilyVariant.h>



namespace android {
@@ -73,9 +74,9 @@ public: 


    uint32_t getMinikinLocaleListId() const { return mMinikinLocaleListId; }



    void setFamilyVariant(minikin::FontFamily::Variant variant) { mFamilyVariant = variant; }

    void setFamilyVariant(minikin::FamilyVariant variant) { mFamilyVariant = variant; }



    minikin::FontFamily::Variant getFamilyVariant() const { return mFamilyVariant; }

    minikin::FamilyVariant getFamilyVariant() const { return mFamilyVariant; }



    void setHyphenEdit(uint32_t hyphen) { mHyphenEdit = hyphen; }
@@ -90,7 +91,7 @@ private: 
    float mWordSpacing = 0;

    std::string mFontFeatureSettings;

    uint32_t mMinikinLocaleListId;

    minikin::FontFamily::Variant mFamilyVariant;

    minikin::FamilyVariant mFamilyVariant;

    uint32_t mHyphenEdit = 0;

    // The native Typeface object has the same lifetime of the Java Typeface

    // object. The Java Paint object holds a strong reference to the Java Typeface

libs/hwui/hwui/PaintImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Paint::Paint() 
        , mWordSpacing(0)

        , mFontFeatureSettings()

        , mMinikinLocaleListId(0)

        , mFamilyVariant(minikin::FontFamily::Variant::DEFAULT) {}

        , mFamilyVariant(minikin::FamilyVariant::DEFAULT) {}



Paint::Paint(const Paint& paint)

        : SkPaint(paint)
@@ -42,7 +42,7 @@ Paint::Paint(const SkPaint& paint) 
        , mWordSpacing(0)

        , mFontFeatureSettings()

        , mMinikinLocaleListId(0)

        , mFamilyVariant(minikin::FontFamily::Variant::DEFAULT) {}

        , mFamilyVariant(minikin::FamilyVariant::DEFAULT) {}



Paint::~Paint() {}