| Index: src/ports/SkFontHost_fontconfig.cpp
|
| diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
|
| index 8abf5cf7f0923c1d82592ff2d2ccb47bfc7b046f..6f24afc57399e38a66daeef59cff2ba4b94d7d5b 100644
|
| --- a/src/ports/SkFontHost_fontconfig.cpp
|
| +++ b/src/ports/SkFontHost_fontconfig.cpp
|
| @@ -15,10 +15,6 @@
|
| #include "SkTypeface.h"
|
| #include "SkTypefaceCache.h"
|
|
|
| -// Defined in SkFontHost_FreeType.cpp
|
| -bool find_name_and_attributes(SkStream* stream, SkString* name,
|
| - SkTypeface::Style* style, bool* isFixedWidth);
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| @@ -148,7 +144,7 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
|
| // ask freetype for reported style and if it is a fixed width font
|
| SkTypeface::Style style = SkTypeface::kNormal;
|
| bool isFixedWidth = false;
|
| - if (!find_name_and_attributes(stream, NULL, &style, &isFixedWidth)) {
|
| + if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) {
|
| return NULL;
|
| }
|
|
|
|
|