| Index: src/fonts/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp
|
| index 2ffe8e3e86f59d83edab16f2b8f4cd840dad42f1..a7f81281c32fffc53f49c52e9a794558690241b7 100644
|
| --- a/src/fonts/SkFontMgr_fontconfig.cpp
|
| +++ b/src/fonts/SkFontMgr_fontconfig.cpp
|
| @@ -50,11 +50,6 @@ private:
|
|
|
| } // namespace
|
|
|
| -
|
| -// Defined in SkFontHost_FreeType.cpp
|
| -bool find_name_and_attributes(SkStream* stream, SkString* name,
|
| - SkTypeface::Style* style, bool* isFixedWidth);
|
| -
|
| // borrow this global from SkFontHost_fontconfig. eventually that file should
|
| // go away, and be replaced with this one.
|
| extern SkFontConfigInterface* SkFontHost_fontconfig_ref_global();
|
| @@ -307,7 +302,7 @@ protected:
|
| // TODO should the caller give us the style or should we get it from freetype?
|
| 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;
|
| }
|
|
|
|
|