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

Commit 2d047808 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Remove MinikinSkiaFont::GetGlyph. 

MinikinSkiaFont::GetGlyph is no longer used and MinikinFont:GetGlyph
interface is removed by I13398503841ac06f930b04815017d4b33338efa1.
No behavior chnages are expected with this CL.

Change-Id: I8496aad446c6809f74a5effc7ef1baa25c4381b8
parent 3a2d0340

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;