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

Commit 77d55c7e authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Take hinting into account when caching fonts Bug #9464403"

parents ae2db13e 2d5945e8

libs/hwui/font/Font.cpp

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const mat4& matrix) 
    mStyle = paint->getStyle();

    mStrokeWidth = paint->getStrokeWidth();

    mAntiAliasing = paint->isAntiAlias();

    mHinting = paint->getHinting();

    mLookupTransform.reset();

    mLookupTransform[SkMatrix::kMScaleX] = roundf(fmaxf(1.0f, matrix[mat4::kScaleX]));

    mLookupTransform[SkMatrix::kMScaleY] = roundf(fmaxf(1.0f, matrix[mat4::kScaleY]));
@@ -80,6 +81,7 @@ hash_t Font::FontDescription::hash() const { 
    hash = JenkinsHashMix(hash, android::hash_type(mStyle));

    hash = JenkinsHashMix(hash, android::hash_type(mStrokeWidth));

    hash = JenkinsHashMix(hash, int(mAntiAliasing));

    hash = JenkinsHashMix(hash, android::hash_type(mHinting));

    hash = JenkinsHashMix(hash, android::hash_type(mLookupTransform[SkMatrix::kMScaleX]));

    hash = JenkinsHashMix(hash, android::hash_type(mLookupTransform[SkMatrix::kMScaleY]));

    return JenkinsHashWhiten(hash);
@@ -111,6 +113,9 @@ int Font::FontDescription::compare(const Font::FontDescription& lhs, 
    deltaInt = int(lhs.mAntiAliasing) - int(rhs.mAntiAliasing);

    if (deltaInt != 0) return deltaInt;



    deltaInt = int(lhs.mHinting) - int(rhs.mHinting);

    if (deltaInt != 0) return deltaInt;



    if (lhs.mLookupTransform[SkMatrix::kMScaleX] <

            rhs.mLookupTransform[SkMatrix::kMScaleX]) return -1;

    if (lhs.mLookupTransform[SkMatrix::kMScaleX] >

libs/hwui/font/Font.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public: 
        uint8_t mStyle;

        float mStrokeWidth;

        bool mAntiAliasing;

        uint8_t mHinting;

        SkMatrix mLookupTransform;

        SkMatrix mInverseLookupTransform;

    };