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

Commit d5342ae4 authored by Mike Reed's avatar Mike Reed
Browse files

use SkTextEncoding 

Test: make

Change-Id: I699aa495573e410043caaf97599172471fe8895d
parent bc1fdab2

core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/jni/android/graphics/Paint.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

libs/hwui/SkiaCanvas.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)));

libs/hwui/hwui/MinikinSkia.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

libs/hwui/tests/common/TestUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

}