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 216 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

[eae, 2016/04/22 02:05:46]

Please change this to remove the reference to SkFontStyle as you are effectively
making that part of the change.

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

Done.

     // 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)));
+    return adoptRef(SkTypeface::CreateFromName(name.data(), fontStyle(fontDescription)));

[bungeman-skia, 2016/04/22 18:15:36]

Why not just

// FIXME: Use m_fontManager, matchFamilyStyle legacyCreateTypeface on all
platforms.
RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());
return adoptRef(fm->legacyCreateTypeface(name.data(),
fontStyle(fontDescription)));

No need to add anything to Skia, tested to to work with the 'Ubuntu' font
locally (apparently the only font I have locally installed with many weights),
makes it obvious that this needs to always have a m_fontManager in the long run.

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

Done.

 }
 
 #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