OSDN Git Service

Remove MinikinSkiaFont::GetGlyph.
authorSeigo Nonaka <nona@google.com>
Tue, 13 Oct 2015 10:37:48 +0000 (19:37 +0900)
committerSeigo Nonaka <nona@google.com>
Thu, 15 Oct 2015 02:52:38 +0000 (02:52 +0000)
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

core/jni/android/graphics/MinikinSkia.cpp
core/jni/android/graphics/MinikinSkia.h

index 4649b07..8ac5d46 100644 (file)
@@ -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);
index a06428d..8f469ba 100644 (file)
@@ -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;
 
@@ -54,4 +52,4 @@ private:
 
 }  // namespace android
 
-#endif  // _ANDROID_GRAPHICS_MINIKIN_SKIA_H_
\ No newline at end of file
+#endif  // _ANDROID_GRAPHICS_MINIKIN_SKIA_H_