Use Skia for font selection on windows

Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 35 matching lines @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StdLibExtras.h"
 
 namespace WebCore {
 
 #if !ENABLE(GDI_FONTS_ON_WINDOWS)
 void FontPlatformData::setupPaint(SkPaint* paint) const
 {
     const float ts = m_size >= 0 ? m_size : 12;
     paint->setTextSize(SkFloatToScalar(m_size));
-    paint->setTypeface(m_typeface);
+    paint->setTypeface(typeface());
 }
 #endif
 
 // Lookup the current system settings for font smoothing.
 // We cache these values for performance, but if the browser has a way to be
 // notified when these change, we could re-query them at that time.
 static uint32_t getDefaultGDITextFlags()
 {
     static bool gInited;
     static uint32_t gFlags;
@@ skipping 80 matching lines @@
     , m_isHashTableDeletedValue(false)
 {
 }
 
 // FIXME: this constructor is needed for SVG fonts but doesn't seem to do much
 FontPlatformData::FontPlatformData(float size, bool bold, bool oblique)
     : m_font(0)
     , m_size(size)
     , m_orientation(Horizontal)
     , m_scriptCache(0)
+    , m_typeface(0)
     , m_paintTextFlags(0)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& data)
     : m_font(data.m_font)
     , m_size(data.m_size)
     , m_orientation(data.m_orientation)
     , m_scriptCache(0)
     , m_typeface(data.m_typeface)
     , m_paintTextFlags(data.m_paintTextFlags)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& data, float textSize)
     : m_font(data.m_font)
     , m_size(textSize)
     , m_orientation(data.m_orientation)
     , m_scriptCache(0)
     , m_typeface(data.m_typeface)
     , m_paintTextFlags(data.m_paintTextFlags)
     , m_isHashTableDeletedValue(false)
 {
 }
 
+FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
+    : m_font(0)
+    , m_size(textSize)
+    , m_orientation(orientation)
+    , m_scriptCache(0)
+    , m_typeface(tf)
+    , m_isHashTableDeletedValue(false)
+{
+    // FIXME: This can be removed together with m_font once the last few
+    // uses of hfont() has been eliminated.
+    LOGFONT logFont;
+    SkLOGFONTFromTypeface(tf, &logFont);
+    logFont.lfHeight = -textSize;
+    HFONT hFont = CreateFontIndirect(&logFont);
+    if (hFont)
+        m_font = RefCountedHFONT::create(hFont);
+    m_paintTextFlags = computePaintTextFlags(logFont);
+}
+
 FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
 {
     if (this != &data) {
         m_font = data.m_font;
         m_size = data.m_size;
         m_orientation = data.m_orientation;
         m_typeface = data.m_typeface;
         m_paintTextFlags = data.m_paintTextFlags;
 
         // The following fields will get re-computed if necessary.
@@ skipping 29 matching lines @@
                 LOG_ERROR("Unable to get the text metrics after second attempt");
         }
     }
 
     bool treatAsFixedPitch = !(textMetric.tmPitchAndFamily & TMPF_FIXED_PITCH);
 
     SelectObject(dc, oldFont);
 
     return treatAsFixedPitch;
 #else
-    return typeface()->isFixedPitch();
+    return typeface() && typeface()->isFixedPitch();
 #endif
 }
 
 FontPlatformData::RefCountedHFONT::~RefCountedHFONT()
 {
     DeleteObject(m_hfont);
 }
 
 SCRIPT_FONTPROPERTIES* FontPlatformData::scriptFontProperties() const
 {
@@ skipping 31 matching lines @@
 
 bool FontPlatformData::ensureFontLoaded(HFONT font)
 {
     WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport();
     // if there is no sandbox, then we can assume the font
     // was able to be loaded successfully already
     return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true;
 }
 
 }