Move legacyCreateTypeface to SkFontStyle.

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 192 matching lines @@
     AtomicString family = creationParams.family();
     // If we're creating a fallback font (e.g. "-webkit-monospace"), convert the name into
     // the fallback name (like "monospace") that fontconfig understands.
     if (!family.length() || family.startsWith("-webkit-")) {
         name = getFallbackFontFamily(fontDescription).getString().utf8();
     } else {
         // convert the name to utf8
         name = family.utf8();
     }
 
-    int style = SkTypeface::kNormal;
-    if (fontDescription.weight() >= FontWeight600)
-        style |= SkTypeface::kBold;
-    if (fontDescription.style())
-        style |= SkTypeface::kItalic;
-
 #if OS(WIN)
     if (s_sideloadedFonts) {
         HashMap<String, RefPtr<SkTypeface>>::iterator sideloadedFont =
             s_sideloadedFonts->find(name.data());
         if (sideloadedFont != s_sideloadedFonts->end())
             return sideloadedFont->value;
     }
 
     if (m_fontManager) {
         return adoptRef(useDirectWrite()
             ? m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescription))
-            : m_fontManager->legacyCreateTypeface(name.data(), style)
+            : m_fontManager->legacyCreateTypeface(name.data(), fontStyle(fontDescription))
             );
     }
 #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)));
 }
 
 #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