Move legacyCreateTypeface to SkFontStyle.

third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

 /*
  * Copyright (C) 2007 Apple Computer, Inc.
  * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved.
  * Copyright (C) 2010 Company 100, Inc.
  *
  * 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
@@ skipping 40 matching lines @@
 }
 
 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold, bool italic, FontOrientation orientation)
 {
     ASSERT(m_typeface);
 #if OS(WIN)
     if (!FontCache::useDirectWrite()) {
         // FIXME: Skia currently renders synthetic bold and italics with
         // hinting and without linear metrics on the windows GDI backend
         // while the DirectWrite backend does the right thing. Using
-        // CreateFromName and specifying the bold/italics style allows
+        // legacyCreateTypeface and specifying the bold/italics style allows
         // for proper rendering of synthetic style. Once Skia has been
         // updated this workaround will no longer be needed.
         // http://crbug.com/332958
         bool syntheticBold = bold && !m_typeface->isBold();
         bool syntheticItalic = italic && !m_typeface->isItalic();
         if (syntheticBold || syntheticItalic) {
             SkString name;
             m_typeface->getFamilyName(&name);
 
-            int style = SkTypeface::kNormal;
-            if (syntheticBold)
-                style |= SkTypeface::kBold;
-            if (syntheticItalic)
-                style |= SkTypeface::kItalic;
-
-            RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager()->legacyCreateTypeface(name.c_str(), static_cast<SkTypeface::Style>(style)));
+            SkFontStyle realStyle = m_typeface->fontStyle();
+            SkFontStyle syntheticStyle = SkFontStyle(
+                realStyle.weight() + (syntheticBold ? 200 : 0),
+                realStyle.width(),
+                syntheticItalic ? SkFontStyle::kItalic_Slant : realStyle.slant());
+            RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager()->legacyCreateTypeface(name.c_str(), syntheticStyle));
             syntheticBold = false;
             syntheticItalic = false;
             return FontPlatformData(typeface.release(), "", size, syntheticBold, syntheticItalic, orientation);
         }
     }
 #endif
     return FontPlatformData(m_typeface.get(), "", size, bold && !m_typeface->isBold(), italic && !m_typeface->isItalic(), orientation);
 }
 
 PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer, String& otsParseMessage)
@@ skipping 20 matching lines @@
 
     return adoptPtr(new FontCustomPlatformData(typeface.release()));
 }
 
 bool FontCustomPlatformData::supportsFormat(const String& format)
 {
     return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || OpenTypeSanitizer::supportsFormat(format);
 }
 
 } // namespace blink