Switch non-gdi windows font path to use new SkFontMgr

Source/core/platform/graphics/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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include <unicode/locid.h>
+
+#include "SkFontMgr.h"
 #include "SkTypeface.h"
 #include "core/platform/NotImplemented.h"
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/FontCache.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/SimpleFontData.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
+#include <unicode/locid.h>
 
 namespace WebCore {
 
 void FontCache::platformInit()
 {
 }
 
 #if !OS(WINDOWS)
 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
 {
@@ skipping 87 matching lines @@
         // convert the name to utf8
         name = family.string().utf8();
     }
 
     int style = SkTypeface::kNormal;
     if (fontDescription.weight() >= FontWeightBold)
         style |= SkTypeface::kBold;
     if (fontDescription.italic())
         style |= SkTypeface::kItalic;
 
+    // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface.
+#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+    if (m_fontManager)
+        return m_fontManager->legacyCreateTypeface(name.data(), style);
+#endif
+
     return SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style));
 }
 
 #if !OS(WINDOWS)
 FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family)
 {
     CString name;
     SkTypeface* tf = createTypeface(fontDescription, family, name);
     if (!tf)
         return 0;
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontDescription.computedSize(),
         fontDescription.weight() >= FontWeightBold && !tf->isBold(),
         fontDescription.italic() && !tf->isItalic(),
         fontDescription.orientation());
     tf->unref();
     return result;
 }
 #endif // !OS(WINDOWNS)
 
 } // namespace WebCore