summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Seigo Nonaka <nona@google.com> 2015-10-13 19:37:48 +0900
committer Seigo Nonaka <nona@google.com> 2015-10-15 02:52:38 +0000
commit2d047808039b4848550159720bfb64e7b55e6e5a (patch)
treea576aac45397af3caa96b48269b6bed6f3ffece7
parent3a2d034062aebb4165ef79bd4482956b747407b1 (diff)
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
-rw-r--r--core/jni/android/graphics/MinikinSkia.cpp10
-rw-r--r--core/jni/android/graphics/MinikinSkia.h4
2 files changed, 1 insertions, 13 deletions
diff --git a/core/jni/android/graphics/MinikinSkia.cpp b/core/jni/android/graphics/MinikinSkia.cpp
index 4649b073b53b..8ac5d4664687 100644
--- a/core/jni/android/graphics/MinikinSkia.cpp
+++ b/core/jni/android/graphics/MinikinSkia.cpp
@@ -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);
diff --git a/core/jni/android/graphics/MinikinSkia.h b/core/jni/android/graphics/MinikinSkia.h
index a06428d26e5e..8f469ba01ddd 100644
--- a/core/jni/android/graphics/MinikinSkia.h
+++ b/core/jni/android/graphics/MinikinSkia.h
@@ -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_