| Index: src/ports/SkFontHost_linux.cpp
|
| diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
|
| index 5d62e367f0a736580f61bf28413794da7548925d..da2c2d00d14fb92f4c85c44daaea4944a905dfd2 100644
|
| --- a/src/ports/SkFontHost_linux.cpp
|
| +++ b/src/ports/SkFontHost_linux.cpp
|
| @@ -32,8 +32,6 @@ public:
|
|
|
| bool isSysFont() const { return fIsSysFont; }
|
|
|
| - virtual const char* getUniqueString() const = 0;
|
| -
|
| protected:
|
| void onGetFamilyName(SkString* familyName) const override {
|
| *familyName = fFamilyName;
|
| @@ -41,7 +39,6 @@ protected:
|
|
|
| void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override {
|
| desc->setFamilyName(fFamilyName.c_str());
|
| - desc->setFontFileName(this->getUniqueString());
|
| desc->setFontIndex(fIndex);
|
| *isLocal = !this->isSysFont();
|
| }
|
| @@ -63,8 +60,6 @@ class SkTypeface_Empty : public SkTypeface_Custom {
|
| public:
|
| SkTypeface_Empty() : INHERITED(SkFontStyle(), false, true, SkString(), 0) {}
|
|
|
| - const char* getUniqueString() const override { return NULL; }
|
| -
|
| protected:
|
| SkStreamAsset* onOpenStream(int*) const override { return NULL; }
|
|
|
| @@ -81,8 +76,6 @@ public:
|
| , fStream(stream)
|
| { }
|
|
|
| - const char* getUniqueString() const override { return NULL; }
|
| -
|
| protected:
|
| SkStreamAsset* onOpenStream(int* ttcIndex) const override {
|
| *ttcIndex = this->getIndex();
|
| @@ -112,14 +105,6 @@ public:
|
| , fStream(c_CustomTypefaceRetain ? SkStream::NewFromFile(fPath.c_str()) : NULL)
|
| { }
|
|
|
| - const char* getUniqueString() const override {
|
| - const char* str = strrchr(fPath.c_str(), '/');
|
| - if (str) {
|
| - str += 1; // skip the '/'
|
| - }
|
| - return str;
|
| - }
|
| -
|
| protected:
|
| SkStreamAsset* onOpenStream(int* ttcIndex) const override {
|
| *ttcIndex = this->getIndex();
|
|
|