Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to SkFontHinting

Browse Source 
Test: make

Change-Id: I3f734e390b2b03deadf8a890f6162517c8017787
This commit is contained in:
Mike Reed
2018-11-05 16:13:54 -05:00
parent b1eeab34a6
commit dad2f8969e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android/graphics/Paint.cpp
View File

@@ -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) {

4
libs/hwui/hwui/MinikinSkia.cpp
View File

@@ -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,