Allow various font weights in gfx.

ui/base/resource/resource_bundle.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_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 228 matching lines @@
                                                ScaleFactor scale_factor) const;
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   base::string16 GetLocalizedString(int message_id);
 
   // Returns a font list derived from the platform-specific "Base" font list.
   // The result is always cached and exists for the lifetime of the process.
   const gfx::FontList& GetFontListWithDelta(
       int size_delta,
-      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+      gfx::Font::FontStyle style = gfx::Font::NORMAL,
+      gfx::Font::Weight weight = gfx::Font::Weight::NORMAL);
 
   // Returns the primary font from the FontList given by GetFontListWithDelta().
   const gfx::Font& GetFontWithDelta(
       int size_delta,
-      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+      gfx::Font::FontStyle style = gfx::Font::NORMAL,
+      gfx::Font::Weight weight = gfx::Font::Weight::NORMAL);

[sky, 2016/03/31 17:04:08]

The style guide says not to use defaults like this. You can either update all
call sites, or add a variant: GetFontWithDeltaAndWeight.

[Peter Kasting, 2016/03/31 21:04:49]

No longer true (style guide was recently updated).  See
http://google.github.io/styleguide/cppguide.html#Default_Arguments for the
current ruling.

I think defaults are likely OK here, but check the guidelines to be sure.

[Mikus, 2016/04/04 12:16:25]

Acknowledged.

 
   // Deprecated. Returns fonts using hard-coded size deltas implied by |style|.
   const gfx::FontList& GetFontList(FontStyle style);
   const gfx::Font& GetFont(FontStyle style);
 
   // Resets and reloads the cached fonts.  This is useful when the fonts of the
   // system have changed, for example, when the locale has changed.
   void ReloadFonts();
 
   // Overrides the path to the pak file from which the locale resources will be
@@ skipping 42 matching lines @@
                            MDResourceAccess);
 
   friend class ResourceBundleMacImageTest;
   friend class ResourceBundleImageTest;
   friend class ResourceBundleTest;
   friend class ChromeBrowserMainMacBrowserTest;
 
   class ResourceBundleImageSource;
   friend class ResourceBundleImageSource;
 
+  struct FontKey;
+
   typedef base::hash_map<int, base::string16> IdToStringMap;
 
   // Ctor/dtor are private, since we're a singleton.
   explicit ResourceBundle(Delegate* delegate);
   ~ResourceBundle();
 
   // Shared initialization.
   static void InitSharedInstance(Delegate* delegate);
 
   // Free skia_images_.
@@ skipping 99 matching lines @@
   // ownership of the pointers.
   typedef std::map<int, gfx::Image> ImageMap;
   ImageMap images_;
 
   gfx::Image empty_image_;
 
   // The various font lists used, as a map from a signed size delta from the
   // platform base font size, plus style, to the FontList. Cached to avoid
   // repeated GDI creation/destruction and font derivation.
   // Must be accessed only while holding |images_and_fonts_lock_|.
-  std::map<std::pair<int, gfx::Font::FontStyle>, gfx::FontList> font_cache_;
+  std::map<FontKey, gfx::FontList> font_cache_;
 
   base::FilePath overridden_pak_path_;
 
   IdToStringMap overridden_locale_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_