aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontHost_FreeType_common.h
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-07-13 05:16:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-13 05:16:58 -0700
commite3aea10428d1597838fd563c92340beaf969a9b4 (patch)
treec9afef7b181fbfdb9897c72b4fe61cd44f34d692 /src/ports/SkFontHost_FreeType_common.h
parentba3880fa6d47d467bfcf4db80c553f051336e406 (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 'src/ports/SkFontHost_FreeType_common.h')
-rw-r--r--src/ports/SkFontHost_FreeType_common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index 6d050cdd99..3801453e22 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -71,8 +71,8 @@ public:
};
protected:
- SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch)
- : INHERITED(style, uniqueID, isFixedPitch)
+ SkTypeface_FreeType(const SkFontStyle& style, bool isFixedPitch)
+ : INHERITED(style, isFixedPitch)
{}
virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,