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

Commit 04cb7877 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Merge "Remove MinikinSkiaFont::GetGlyph."

parents 686fa711 2d047808

core/jni/android/graphics/MinikinSkia.cpp

+0 −10
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ MinikinFontSkia::~MinikinFontSkia() { 
    SkSafeUnref(mTypeface);

}



bool MinikinFontSkia::GetGlyph(uint32_t codepoint, uint32_t *glyph) const {

    SkPaint paint;

    paint.setTypeface(mTypeface);

    paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);

    uint16_t glyph16;

    paint.textToGlyphs(&codepoint, sizeof(codepoint), &glyph16);

    *glyph  = glyph16;

    return !!glyph16;

}



static void MinikinFontSkia_SetSkiaPaint(const MinikinFont* font, SkPaint* skPaint, const MinikinPaint& paint) {

    skPaint->setTextEncoding(SkPaint::kGlyphID_TextEncoding);

    skPaint->setTextSize(paint.size);

core/jni/android/graphics/MinikinSkia.h

+1 −3
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ public: 


    ~MinikinFontSkia();



    bool GetGlyph(uint32_t codepoint, uint32_t *glyph) const;



    float GetHorizontalAdvance(uint32_t glyph_id,

        const MinikinPaint &paint) const;