Use the new legacyCreateTypeface that has an SkFontStyle parameter

third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 153 matching lines @@
     if (!fontPlatformData) {
         DEFINE_STATIC_LOCAL(const FontFaceCreationParams, mssansserifCreationParams, (AtomicString("Microsoft Sans Serif")));
         fontPlatformData = getFontPlatformData(description, mssansserifCreationParams);
     }
 #endif
 
     ASSERT(fontPlatformData);
     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
 }
 
 #if OS(WIN) || OS(LINUX)

[bungeman-skia, 2016/04/22 18:42:28]

You'll need to remove this ifdef block for Android I think.

[bungeman-skia, 2016/04/22 18:44:49]

I stated that poorly, the ifdef is no longer needed, since the fontStyle
function is now used on all platforms (the ifdef was just here to prevent
platforms which didn't use it from getting unused static function warnings as
errors).

[Tom (Use chromium acct), 2016/04/22 18:51:53]

Done.

[Tom (Use chromium acct), 2016/04/22 18:51:53]

Done.

 static inline SkFontStyle fontStyle(const FontDescription& fontDescription)
 {
     int width = static_cast<int>(fontDescription.stretch());
     int weight = (fontDescription.weight() - FontWeight100 + 1) * 100;
     SkFontStyle::Slant slant = fontDescription.style() == FontStyleItalic
         ? SkFontStyle::kItalic_Slant
         : SkFontStyle::kUpright_Slant;
     return SkFontStyle(weight, width, slant);
 }
 
@@ skipping 42 matching lines @@
 #endif
 
 #if OS(LINUX)
     // On linux if the fontManager has been overridden then we should be calling the embedder
     // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the
     // call to the default font Manager.
     if (m_fontManager)
         return adoptRef(m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescription)));
 #endif
 
-    // FIXME: Use m_fontManager, SkFontStyle and matchFamilyStyle instead of
-    // CreateFromName on all platforms.
-    int style = SkTypeface::kNormal;
-    if (fontDescription.weight() >= FontWeight600)
-        style |= SkTypeface::kBold;
-    if (fontDescription.style())
-        style |= SkTypeface::kItalic;
-    return adoptRef(SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style)));
+    // FIXME: Use m_fontManager, matchFamilyStyle instead of
+    // legacyCreateTypeface on all platforms.
+    RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());
+    return adoptRef(fm->legacyCreateTypeface(name.data(),
+        fontStyle(fontDescription)));
 }
 
 #if !OS(WIN)
 PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams, float fontSize)
 {
     CString name;
     RefPtr<SkTypeface> tf(createTypeface(fontDescription, creationParams, name));
     if (!tf)
         return nullptr;
 
     return adoptPtr(new FontPlatformData(tf,
         name.data(),
         fontSize,
         (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
         ((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         fontDescription.useSubpixelPositioning()));
 }
 #endif // !OS(WIN)
 
 } // namespace blink