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

Commit fda187f0 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Follow the constructor signature change in Minikin." into nyc-dev 

am: f9104e33

* commit 'f9104e33':
  Follow the constructor signature change in Minikin.

Change-Id: I5d0e3eb8140b28d1ec1313937492713c40816596
parents 98646e8e f9104e33

libs/hwui/hwui/MinikinSkia.cpp

+2 −5
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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