Follow the constructor signature change in Minikin.

Bug: 28105730
Change-Id: I933521ba08e89c0538b5aa9efa5dcc5e2a17b905

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();

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