Allow various font weights in gfx.

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 <string>
 
 #include "base/compiler_specific.h"
@@ skipping 32 matching lines @@
   // performed other than clamping to a minimum font height if
   // |get_minimum_font_size_callback| is specified.
   typedef void (*AdjustFontCallback)(LOGFONT* lf);
   static AdjustFontCallback adjust_font_callback;
 
   // Returns the font name for the system locale. Some fonts, particularly
   // East Asian fonts, have different names per locale. If the localized font
   // name could not be retrieved, returns GetFontName().
   std::string GetLocalizedFontName() const;
 
-  // Returns a derived Font with the specified |style| and maximum |height|.
-  // The returned Font will be the largest font size with a height <= |height|,
-  // since a size with the exact specified |height| may not necessarily exist.
-  // GetMinimumFontSize() may impose a font size that is taller than |height|.
-  Font DeriveFontWithHeight(int height, int style);
-
   // Overridden from PlatformFont:
-  Font DeriveFont(int size_delta, int style) const override;
+  Font DeriveFont(int size_delta,
+                  int style,
+                  gfx::Font::Weight weight) const override;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

   int GetHeight() override;
+  gfx::Font::Weight GetWeight() const override;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

   int GetBaseline() override;
   int GetCapHeight() override;
   int GetExpectedTextWidth(int length) override;
   int GetStyle() const override;
   const std::string& GetFontName() const override;
   std::string GetActualFontNameForTesting() const override;
   int GetFontSize() const override;
   const FontRenderParams& GetFontRenderParams() override;
   NativeFont GetNativeFont() const override;
 
@@ skipping 27 matching lines @@
   class GFX_EXPORT HFontRef : public base::RefCounted<HFontRef> {
    public:
     // This constructor takes control of the HFONT, and will delete it when
     // the HFontRef is deleted.
     HFontRef(HFONT hfont,
              int font_size,
              int height,
              int baseline,
              int cap_height,
              int ave_char_width,
+             gfx::Font::Weight weight,

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

              int style);
 
     // Accessors
     HFONT hfont() const { return hfont_; }
     int height() const { return height_; }
     int baseline() const { return baseline_; }
     int cap_height() const { return cap_height_; }
     int ave_char_width() const { return ave_char_width_; }
+    gfx::Font::Weight weight() const { return weight_; }

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

     int style() const { return style_; }
     const std::string& font_name() const { return font_name_; }
     int font_size() const { return font_size_; }
     int requested_font_size() const { return requested_font_size_; }
 
     // Returns the average character width in dialog units.
     int GetDluBaseX();
 
     // Helper to return the average character width using the text extent
     // technique mentioned here. http://support.microsoft.com/kb/125681.
     static int GetAverageCharWidthInDialogUnits(HFONT gdi_font);
 
    private:
     friend class base::RefCounted<HFontRef>;
     FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_UniscribeFallback);
     FRIEND_TEST_ALL_PREFIXES(PlatformFontWinTest, Metrics_SkiaVersusGDI);
     FRIEND_TEST_ALL_PREFIXES(PlatformFontWinTest, DirectWriteFontSubstitution);
 
     ~HFontRef();
 
     const HFONT hfont_;
     const int font_size_;
     const int height_;
     const int baseline_;
     const int cap_height_;
     const int ave_char_width_;
+    const gfx::Font::Weight weight_;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

     const int style_;
     // Average character width in dialog units. This is queried lazily from the
     // system, with an initial value of -1 meaning it hasn't yet been queried.
     int dlu_base_x_;
     std::string font_name_;
 
     // If the requested font size is not possible for the font, |font_size_|
     // will be different than |requested_font_size_|. This is stored separately
     // so that code that increases the font size in a loop will not cause the
     // loop to get stuck on the same size.
@@ skipping 47 matching lines @@
 
   // Pointer to the global IDWriteFactory interface.
   static IDWriteFactory* direct_write_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformFontWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_PLATFORM_FONT_WIN_H_