diff options
| author |  bungeman <bungeman@google.com> | 2016-07-13 05:16:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-13 05:16:58 -0700 |
| commit | e3aea10428d1597838fd563c92340beaf969a9b4 (patch) | |
| tree | c9afef7b181fbfdb9897c72b4fe61cd44f34d692 /include/core/SkTypeface.h | |
| parent | ba3880fa6d47d467bfcf4db80c553f051336e406 (diff) | |
Remove user specified typeface id.
Now that there may be multiple font managers in a process the typeface
ids must be unique across all typefaces, not just unique within a font
manager. If two typefaces have the same id there will be issues in the
glyph cache. All existing font managers were already doing this by
calling SkFontCache::NewFontID, so centralize this in SkTypeface.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147733002
Review-Url: https://codereview.chromium.org/2147733002
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 7304cfb82a..e3a311da43 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -341,7 +341,7 @@ protected: /** uniqueID must be unique and non-zero */ - SkTypeface(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch = false); + SkTypeface(const SkFontStyle& style, bool isFixedPitch = false); virtual ~SkTypeface(); /** Sets the fixedPitch bit. If used, must be called in the constructor. */ |