| Index: src/ports/SkFontHost_FreeType.cpp
|
| diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
|
| index 5c3034162d29b29c5f0fc8e43bf28290bf8940bd..e21f4dd50e8d3b1b344b7790f65af99434a389c0 100644
|
| --- a/src/ports/SkFontHost_FreeType.cpp
|
| +++ b/src/ports/SkFontHost_FreeType.cpp
|
| @@ -466,18 +466,13 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
|
| info->fFontName.set(FT_Get_Postscript_Name(face));
|
| info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag;
|
| if (FT_HAS_MULTIPLE_MASTERS(face)) {
|
| - info->fFlags = SkTBitOr<SkAdvancedTypefaceMetrics::FontFlags>(
|
| - info->fFlags, SkAdvancedTypefaceMetrics::kMultiMaster_FontFlag);
|
| + info->fFlags |= SkAdvancedTypefaceMetrics::kMultiMaster_FontFlag;
|
| }
|
| if (!canEmbed(face)) {
|
| - info->fFlags = SkTBitOr<SkAdvancedTypefaceMetrics::FontFlags>(
|
| - info->fFlags,
|
| - SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag);
|
| + info->fFlags |= SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag;
|
| }
|
| if (!canSubset(face)) {
|
| - info->fFlags = SkTBitOr<SkAdvancedTypefaceMetrics::FontFlags>(
|
| - info->fFlags,
|
| - SkAdvancedTypefaceMetrics::kNotSubsettable_FontFlag);
|
| + info->fFlags |= SkAdvancedTypefaceMetrics::kNotSubsettable_FontFlag;
|
| }
|
| info->fLastGlyphID = face->num_glyphs - 1;
|
| info->fEmSize = 1000;
|
|
|