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

Commit 0ab44396 authored by Ben Wagner's avatar Ben Wagner
Browse files

Replace Skia font macros with enums. 

This mechanically replaces kXXX_SkTextEncoding with SkTextEncoding::kXXX
and kXXX_SkFontHinting with SkFontHinting::kXXX. This will allow Skia to
remove these old macro constants and get everyone on the new enums.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4c3b1834b1c4cdfc7f708613c49dfb18fc3194f5
parent dee0ccdb

core/jni/android/graphics/Paint.cpp

+2 −2
Original line number Diff line number Diff line
@@ -671,12 +671,12 @@ namespace PaintGlue { 


    static jint getHinting(jlong paintHandle) {

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

                == kNo_SkFontHinting ? 0 : 1;

                == SkFontHinting::kNone ? 0 : 1;

    }



    static void setHinting(jlong paintHandle, jint mode) {

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

                mode == 0 ? kNo_SkFontHinting : kNormal_SkFontHinting);

                mode == 0 ? SkFontHinting::kNone : SkFontHinting::kNormal);

    }



    static void setAntiAlias(jlong paintHandle, jboolean aa) {

libs/hwui/tests/common/scenes/ListViewAnimation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class ListViewAnimation : public TestListViewSceneBase { 
        char charToShow = 'A' + (rand() % 26);

        const SkPoint pos = {SkIntToScalar(size / 2),

                                /*approximate centering*/ SkFloatToScalar(size * 0.7f)};

        canvas.drawSimpleText(&charToShow, 1, kUTF8_SkTextEncoding, pos.fX, pos.fY, font, paint);

        canvas.drawSimpleText(&charToShow, 1, SkTextEncoding::kUTF8, pos.fX, pos.fY, font, paint);

        return bitmap;

    }