Use the correct font metrics in base PlatformFontWin if DirectWrite is used in the browser for font…

ui/gfx/platform_font_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_PLATFORM_FONT_WIN_H_
 #define UI_GFX_PLATFORM_FONT_WIN_H_
 
+#include <dwrite.h>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/platform_font.h"
 
 namespace gfx {
 
 class GFX_EXPORT PlatformFontWin : public PlatformFont {
@@ skipping 41 matching lines @@
   virtual int GetBaseline() const override;
   virtual int GetCapHeight() const override;
   virtual int GetExpectedTextWidth(int length) const override;
   virtual int GetStyle() const override;
   virtual std::string GetFontName() const override;
   virtual std::string GetActualFontNameForTesting() const override;
   virtual int GetFontSize() const override;
   virtual const FontRenderParams& GetFontRenderParams() const override;
   virtual NativeFont GetNativeFont() const override;
 
+  // Called once during initialization if we are using DirectWrite for fonts.
+  static void set_direct_write_factory(IDWriteFactory* factory) {
+    direct_write_factory_ = factory;
+  }
+
  private:
   virtual ~PlatformFontWin() {}
 
   // Chrome text drawing bottoms out in the Windows GDI functions that take an
   // HFONT (an opaque handle into Windows). To avoid lots of GDI object
   // allocation and destruction, Font indirectly refers to the HFONT by way of
   // an HFontRef. That is, every Font has an HFontRef, which has an HFONT.
   //
   // HFontRef is reference counted. Upon deletion, it deletes the HFONT.
   // By making HFontRef maintain the reference to the HFONT, multiple
@@ skipping 65 matching lines @@
   static HFontRef* CreateHFontRef(HFONT font);
 
   // Creates and returns a new HFONTRef from the specified HFONT. Uses provided
   // |font_metrics| instead of calculating new one.
   static HFontRef* CreateHFontRef(HFONT font, const TEXTMETRIC& font_metrics);
 
   // Returns a largest derived Font whose height does not exceed the height of
   // |base_font|.
   static Font DeriveWithCorrectedSize(HFONT base_font);
 
+  // Converts the GDI font identified by the |gdi_font| parameter to a
+  // DirectWrite compatible HFONT, i.e with metrics compatible with
+  // DirectWrite.
+  // Returns the HFONT which is created from DirectWrite compatible font
+  // metrics.
+  static HFONT ConvertGDIFontToDirectWriteFont(HFONT gdi_font);
+
   // Creates a new PlatformFontWin with the specified HFontRef. Used when
   // constructing a Font from a HFONT we don't want to copy.
   explicit PlatformFontWin(HFontRef* hfont_ref);
 
     // Reference to the base font all fonts are derived from.
   static HFontRef* base_font_ref_;
 
   // Indirect reference to the HFontRef, which references the underlying HFONT.
   scoped_refptr<HFontRef> font_ref_;
 
+  // Pointer to the global IDWriteFactory interface. This is only set if we are
+  // using DirectWrite for fonts. Defaults to NULL.
+  static IDWriteFactory* direct_write_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PlatformFontWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_PLATFORM_FONT_WIN_H_