From b93872ad64afaafa1799a293850f48a96708182e Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Mon, 11 Apr 2016 18:12:27 +0900 Subject: [PATCH] Follow the constructor signature change in Minikin. Bug: 28105730 Change-Id: I933521ba08e89c0538b5aa9efa5dcc5e2a17b905 --- libs/hwui/hwui/MinikinSkia.cpp | 7 ++----- libs/hwui/hwui/MinikinSkia.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/hwui/hwui/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp index b39de266846ce..a455f576e38d7 100644 --- a/libs/hwui/hwui/MinikinSkia.cpp +++ b/libs/hwui/hwui/MinikinSkia.cpp @@ -24,7 +24,8 @@ namespace android { MinikinFontSkia::MinikinFontSkia(SkTypeface* typeface, const void* fontData, size_t fontSize, int ttcIndex) : - mTypeface(typeface), mFontData(fontData), mFontSize(fontSize), mTtcIndex(ttcIndex) { + MinikinFont(typeface->uniqueID()), mTypeface(typeface), mFontData(fontData), + mFontSize(fontSize), mTtcIndex(ttcIndex) { } MinikinFontSkia::~MinikinFontSkia() { @@ -99,10 +100,6 @@ int MinikinFontSkia::GetFontIndex() const { return mTtcIndex; } -int32_t MinikinFontSkia::GetUniqueId() const { - return mTypeface->uniqueID(); -} - uint32_t MinikinFontSkia::packPaintFlags(const SkPaint* paint) { uint32_t flags = paint->getFlags(); SkPaint::Hinting hinting = paint->getHinting(); diff --git a/libs/hwui/hwui/MinikinSkia.h b/libs/hwui/hwui/MinikinSkia.h index dbc65f98fe12d..a7c9fb0b09d41 100644 --- a/libs/hwui/hwui/MinikinSkia.h +++ b/libs/hwui/hwui/MinikinSkia.h @@ -41,8 +41,6 @@ public: const void* GetTable(uint32_t tag, size_t* size, MinikinDestroyFunc* destroy); - int32_t GetUniqueId() const; - SkTypeface* GetSkTypeface() const; // Access to underlying raw font bytes