Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f9104e3

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

Change-Id: I5d0e3eb8140b28d1ec1313937492713c40816596
This commit is contained in:
Seigo Nonaka
2016-04-11 20:58:04 +00:00
committed by android-build-merger
parent 98646e8e5d f9104e33e4
commit fda187f040
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/hwui/MinikinSkia.cpp
View File

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

2
libs/hwui/hwui/MinikinSkia.h
View File

@@ -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