Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / fonts / SkFontMgr_fontconfig.cpp

diff --git a/src/third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp b/src/third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp
index a7f8128..4f99a6f 100644 (file)
--- a/src/third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp
+++ b/src/third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp
@@ -214,7 +214,7 @@ SkTypeface* SkFontStyleSet_FC::matchStyle(const SkFontStyle& pattern) {
 class SkFontMgr_fontconfig : public SkFontMgr {
     SkAutoTUnref<SkFontConfigInterface> fFCI;
     SkDataTable* fFamilyNames;
-
+    SkTypeface_FreeType::Scanner fScanner;
 
 public:
     SkFontMgr_fontconfig(SkFontConfigInterface* fci)
@@ -300,9 +300,9 @@ protected:
         }
 
         // TODO should the caller give us the style or should we get it from freetype?
-        SkTypeface::Style style = SkTypeface::kNormal;
+        SkFontStyle style;
         bool isFixedWidth = false;
-        if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) {
+        if (!fScanner.scanFont(stream, 0, NULL, &style, &isFixedWidth)) {
             return NULL;
         }