Index: src/ports/SkFontMgr_fontconfig.cpp |
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp |
index fd5f1b08304e4b6cc5a12168ef075696c3b08725..bb618aebfefe25e10885ef8bed39fc724f754772 100644 |
--- a/src/ports/SkFontMgr_fontconfig.cpp |
+++ b/src/ports/SkFontMgr_fontconfig.cpp |
@@ -5,6 +5,7 @@ |
* found in the LICENSE file. |
*/ |
+#include "SkAdvancedTypefaceMetrics.h" |
#include "SkDataTable.h" |
#include "SkFixed.h" |
#include "SkFontDescriptor.h" |
@@ -484,6 +485,20 @@ public: |
this->INHERITED::onFilterRec(rec); |
} |
+ SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(PerGlyphInfo perGlyphInfo, |
+ const uint32_t* glyphIDs, |
+ uint32_t glyphIDsCount) const override |
+ { |
+ SkAdvancedTypefaceMetrics* info = |
+ this->INHERITED::onGetAdvancedTypefaceMetrics(perGlyphInfo, glyphIDs, glyphIDsCount); |
+ |
+ // Simulated fonts shouldn't be considered to be of the type of their data. |
+ if (get_matrix(fPattern, FC_MATRIX) || get_bool(fPattern, FC_EMBOLDEN)) { |
+ info->fType = SkAdvancedTypefaceMetrics::kOther_Font; |
+ } |
+ return info; |
+ } |
+ |
virtual ~SkTypeface_fontconfig() { |
// Hold the lock while unrefing the pattern. |
FCLocker lock; |