diff options
| author | 2018-11-05 16:13:54 -0500 | |
|---|---|---|
| committer | 2018-11-06 09:47:51 -0500 | |
| commit | dad2f8969e00a4363333ec5e068bc8232450bb99 (patch) | |
| tree | 5d6cfca44697bf6fec7d1ce5cab18a7b9b270f29 | |
| parent | b1eeab34a658b9b592452328c2011ce4e02fc98b (diff) | |
migrate to SkFontHinting
Test: make
Change-Id: I3f734e390b2b03deadf8a890f6162517c8017787
| -rw-r--r-- | core/jni/android/graphics/Paint.cpp | 7 | ||||
| -rw-r--r-- | libs/hwui/hwui/MinikinSkia.cpp | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index d391de75aa9a..a8b0640c3a73 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -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) { diff --git a/libs/hwui/hwui/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp index 2ca40b96c0ba..05dc340e9ef3 100644 --- a/libs/hwui/hwui/MinikinSkia.cpp +++ b/libs/hwui/hwui/MinikinSkia.cpp @@ -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, |