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

Commit 3c5bbd50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "migrate to SkFontHinting"

parents 5bcf4271 dad2f896

core/jni/android/graphics/Paint.cpp

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "SkBlurDrawLooper.h"

#include "SkColorFilter.h"

#include "SkFontTypes.h"

#include "SkMaskFilter.h"

#include "SkPath.h"

#include "SkPathEffect.h"
@@ -684,13 +685,13 @@ namespace PaintGlue { 
    }



    static jint getHinting(jlong paintHandle) {

        return reinterpret_cast<Paint*>(paintHandle)->getHinting()

                == Paint::kNo_Hinting ? 0 : 1;

        return (SkFontHinting)reinterpret_cast<Paint*>(paintHandle)->getHinting()

                == kNo_SkFontHinting ? 0 : 1;

    }



    static void setHinting(jlong paintHandle, jint mode) {

        reinterpret_cast<Paint*>(paintHandle)->setHinting(

                mode == 0 ? Paint::kNo_Hinting : Paint::kNormal_Hinting);

                mode == 0 ? kNo_SkFontHinting : kNormal_SkFontHinting);

    }



    static void setAntiAlias(jlong paintHandle, jboolean aa) {

libs/hwui/hwui/MinikinSkia.cpp

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ std::shared_ptr<minikin::MinikinFont> MinikinFontSkia::createFontWithVariation( 


uint32_t MinikinFontSkia::packPaintFlags(const SkPaint* paint) {

    uint32_t flags = paint->getFlags();

    SkPaint::Hinting hinting = paint->getHinting();

    SkFontHinting hinting = (SkFontHinting)paint->getHinting();

    // select only flags that might affect text layout

    flags &= (SkPaint::kAntiAlias_Flag | SkPaint::kFakeBoldText_Flag | SkPaint::kLinearText_Flag |

              SkPaint::kSubpixelText_Flag | SkPaint::kEmbeddedBitmapText_Flag |
@@ -150,7 +150,7 @@ uint32_t MinikinFontSkia::packPaintFlags(const SkPaint* paint) { 


void MinikinFontSkia::unpackPaintFlags(SkPaint* paint, uint32_t paintFlags) {

    paint->setFlags(paintFlags & SkPaint::kAllFlags);

    paint->setHinting(static_cast<SkPaint::Hinting>(paintFlags >> 16));

    paint->setHinting(static_cast<SkFontHinting>(paintFlags >> 16));

}



void MinikinFontSkia::populateSkPaint(SkPaint* paint, const MinikinFont* font,