diff options
| author |  bungeman <bungeman@google.com> | 2014-09-17 07:48:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-17 07:48:59 -0700 |
| commit | b374d6a62c0259387d90cad74753d8bad9ee1bea (patch) | |
| tree | fd558326c3254d6be22818cab97f18e3223669c2 /src/core/SkTypeface.cpp | |
| parent | 3850971d54b2e07cbf69e282d1455ea1dc3333b6 (diff) | |
Add onGetFamilyName to SkTypeface.
This speeds up and documents this particular feature of SkTypeface
and also frees up SkFontDescriptor to be used only in serialization.
R=reed@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/574873002
Diffstat (limited to 'src/core/SkTypeface.cpp')
| -rw-r--r-- | src/core/SkTypeface.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index fcb2b8e2b1..74dd5d96b9 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -67,6 +67,9 @@ protected: public: virtual bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; } }; + virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + familyName->reset(); + } virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE { return SkNEW(EmptyLocalizedStrings); }; @@ -273,10 +276,8 @@ SkTypeface::LocalizedStrings* SkTypeface::createFamilyNameIterator() const { } void SkTypeface::getFamilyName(SkString* name) const { - bool isLocal = false; - SkFontDescriptor desc(this->style()); - this->onGetFontDescriptor(&desc, &isLocal); - name->set(desc.getFamilyName()); + SkASSERT(name); + this->onGetFamilyName(name); } SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics( |