Allow various font weights in gfx.

ui/views/controls/button/label_button.cc

 // 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.
 
 #include "ui/views/controls/button/label_button.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 27 matching lines @@
 
 const gfx::FontList& GetDefaultNormalFontList() {
   static base::LazyInstance<gfx::FontList>::Leaky font_list =
       LAZY_INSTANCE_INITIALIZER;
   return font_list.Get();
 }
 
 const gfx::FontList& GetDefaultBoldFontList() {
   static base::LazyInstance<gfx::FontList>::Leaky font_list =
       LAZY_INSTANCE_INITIALIZER;
-  if ((font_list.Get().GetFontStyle() & gfx::Font::BOLD) == 0) {
-    font_list.Get() = font_list.Get().
-        DeriveWithStyle(font_list.Get().GetFontStyle() | gfx::Font::BOLD);
-    DCHECK_NE(font_list.Get().GetFontStyle() & gfx::Font::BOLD, 0);
+  if (font_list.Get().GetFontWeight() != gfx::Font::WEIGHT_BOLD) {

[msw, 2016/03/22 01:53:44]

Hmm, I wonder if this should be < (or something smarter), in case we're now
respecting the system weight values and the user's system font is bolder, this
would yield something with less weight... Similar below for SetFontList?

[Mikus, 2016/03/22 14:19:51]

Done.

+    font_list.Get() = font_list.Get().DeriveWithWeight(gfx::Font::WEIGHT_BOLD);
+    DCHECK_EQ(font_list.Get().GetFontWeight(), gfx::Font::WEIGHT_BOLD);
   }
   return font_list.Get();
 }
 
 // Ink drop container view that does not capture any events.
 class InkDropContainerView : public views::View {
  public:
   InkDropContainerView() {}
 
   // View:
@@ skipping 95 matching lines @@
 void LabelButton::SetTextSubpixelRenderingEnabled(bool enabled) {
   label_->SetSubpixelRenderingEnabled(enabled);
 }
 
 const gfx::FontList& LabelButton::GetFontList() const {
   return label_->font_list();
 }
 
 void LabelButton::SetFontList(const gfx::FontList& font_list) {
   cached_normal_font_list_ = font_list;
-  cached_bold_font_list_ = font_list.DeriveWithStyle(
-      font_list.GetFontStyle() | gfx::Font::BOLD);
+  cached_bold_font_list_ = font_list.DeriveWithWeight(gfx::Font::WEIGHT_BOLD);
 
   // STYLE_BUTTON uses bold text to indicate default buttons.
   label_->SetFontList(
       style_ == STYLE_BUTTON && is_default_ ?
       cached_bold_font_list_ : cached_normal_font_list_);
 }
 
 void LabelButton::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
   label_->SetElideBehavior(elide_behavior);
 }
@@ skipping 383 matching lines @@
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 void LabelButton::ResetCachedPreferredSize() {
   cached_preferred_size_valid_ = false;
   cached_preferred_size_ = gfx::Size();
 }
 
 }  // namespace views