diff options
| -rw-r--r-- | core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android/graphics/Paint.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/SkiaCanvas.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/hwui/MinikinSkia.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/tests/common/TestUtils.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp b/core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp index dcb787462a13..cfe742d0134d 100644 --- a/core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp +++ b/core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp @@ -59,7 +59,7 @@ struct HarfBuzzFontData { static void SkiaGetGlyphWidthAndExtents(SkPaint* paint, hb_codepoint_t codepoint, hb_position_t* width, hb_glyph_extents_t* extents) { ALOG_ASSERT(codepoint <= 0xFFFF); - paint->setTextEncoding(SkPaint::kGlyphID_TextEncoding); + paint->setTextEncoding(kGlyphID_SkTextEncoding); SkScalar skWidth; SkRect skBounds; @@ -84,7 +84,7 @@ static hb_bool_t harfbuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoin { HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData); SkPaint* paint = hbFontData->m_paint; - paint->setTextEncoding(SkPaint::kUTF32_TextEncoding); + paint->setTextEncoding(kUTF32_SkTextEncoding); if (unicode > 0x10ffff) { unicode = 0xfffd; diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index a8b0640c3a73..c249e209b29f 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -71,7 +71,7 @@ static JMetricsID gFontMetricsInt_fieldID; static void defaultSettingsForAndroid(Paint* paint) { // GlyphID encoding is required because we are using Harfbuzz shaping - paint->setTextEncoding(Paint::kGlyphID_TextEncoding); + paint->setTextEncoding(kGlyphID_SkTextEncoding); } namespace PaintGlue { @@ -321,7 +321,7 @@ namespace PaintGlue { x += MinikinUtils::xOffsetForTextAlign(paint, layout); Paint::Align align = paint->getTextAlign(); paint->setTextAlign(Paint::kLeft_Align); - paint->setTextEncoding(Paint::kGlyphID_TextEncoding); + paint->setTextEncoding(kGlyphID_SkTextEncoding); GetTextFunctor f(layout, path, x, y, paint, glyphs, pos); MinikinUtils::forFontRun(layout, paint, f); paint->setTextAlign(align); diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index ba343841d760..6be7ef72cf5d 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -681,7 +681,7 @@ void SkiaCanvas::drawGlyphs(ReadGlyphFunc glyphFunc, int count, const SkPaint& p if (mPaintFilter) { mPaintFilter->filter(&paintCopy); } - SkASSERT(paintCopy.getTextEncoding() == SkPaint::kGlyphID_TextEncoding); + SkASSERT(paintCopy.getTextEncoding() == kGlyphID_SkTextEncoding); // Stroke with a hairline is drawn on HW with a fill style for compatibility with Android O and // older. if (!mCanvasOwned && sApiLevel <= 27 && paintCopy.getStrokeWidth() <= 0 && @@ -708,7 +708,7 @@ void SkiaCanvas::drawLayoutOnPath(const minikin::Layout& layout, float hOffset, if (mPaintFilter) { mPaintFilter->filter(&paintCopy); } - SkASSERT(paintCopy.getTextEncoding() == SkPaint::kGlyphID_TextEncoding); + SkASSERT(paintCopy.getTextEncoding() == kGlyphID_SkTextEncoding); const int N = end - start; SkAutoSTMalloc<1024, uint8_t> storage(N * (sizeof(uint16_t) + sizeof(SkRSXform))); diff --git a/libs/hwui/hwui/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp index 769fce498a70..84292c8768c1 100644 --- a/libs/hwui/hwui/MinikinSkia.cpp +++ b/libs/hwui/hwui/MinikinSkia.cpp @@ -43,7 +43,7 @@ MinikinFontSkia::MinikinFontSkia(sk_sp<SkTypeface> typeface, const void* fontDat static void MinikinFontSkia_SetSkiaPaint(const minikin::MinikinFont* font, SkPaint* skPaint, const minikin::MinikinPaint& paint, const minikin::FontFakery& fakery) { - skPaint->setTextEncoding(SkPaint::kGlyphID_TextEncoding); + skPaint->setTextEncoding(kGlyphID_SkTextEncoding); skPaint->setTextSize(paint.size); skPaint->setTextScaleX(paint.scaleX); skPaint->setTextSkewX(paint.skewX); diff --git a/libs/hwui/tests/common/TestUtils.cpp b/libs/hwui/tests/common/TestUtils.cpp index 8a1bc4d2f7f2..f81202292a49 100644 --- a/libs/hwui/tests/common/TestUtils.cpp +++ b/libs/hwui/tests/common/TestUtils.cpp @@ -81,7 +81,7 @@ void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint auto utf16 = asciiToUtf16(text); uint32_t length = strlen(text); SkPaint glyphPaint(paint); - glyphPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); + glyphPaint.setTextEncoding(kGlyphID_SkTextEncoding); canvas->drawText( utf16.get(), length, // text buffer 0, length, // draw range @@ -94,7 +94,7 @@ void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint const SkPath& path) { auto utf16 = asciiToUtf16(text); SkPaint glyphPaint(paint); - glyphPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); + glyphPaint.setTextEncoding(kGlyphID_SkTextEncoding); canvas->drawTextOnPath(utf16.get(), strlen(text), minikin::Bidi::LTR, path, 0, 0, glyphPaint, nullptr); } |