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 14 matching lines @@
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace {
 
 // The default spacing between the icon and text.
 const int kSpacing = 5;
 
+gfx::Font::Weight GetValueBolderThan(gfx::Font::Weight weight) {
+  if (weight < gfx::Font::Weight::BOLD)
+    return gfx::Font::Weight::BOLD;
+  switch (weight) {
+    case gfx::Font::Weight::BOLD:
+      return gfx::Font::Weight::EXTRA_BOLD;
+    case gfx::Font::Weight::EXTRA_BOLD:
+    case gfx::Font::Weight::BLACK:
+      return gfx::Font::Weight::BLACK;
+    default:
+      NOTREACHED();
+  }
+  return gfx::Font::Weight::INVALID;
+}
+
 const gfx::FontList& GetDefaultNormalFontList() {
   static base::LazyInstance<gfx::FontList>::Leaky font_list =
       LAZY_INSTANCE_INITIALIZER;
   return font_list.Get();
 }
 
 const gfx::FontList& GetDefaultBoldFontList() {
   if (!views::PlatformStyle::kDefaultLabelButtonHasBoldFont)
     return GetDefaultNormalFontList();
 
   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);
-  }
+
+  static const gfx::Font::Weight default_bold_weight =
+      font_list.Get().GetFontWeight();
+
+  font_list.Get() = font_list.Get().DeriveWithWeight(
+      GetValueBolderThan(default_bold_weight));
+  DCHECK_GE(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:
   bool CanProcessEventsWithinSubtree() const override {
@@ skipping 96 matching lines @@
   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;
   if (PlatformStyle::kDefaultLabelButtonHasBoldFont) {
-    cached_bold_font_list_ =
-        font_list.DeriveWithStyle(font_list.GetFontStyle() | gfx::Font::BOLD);
+    cached_bold_font_list_ = font_list.DeriveWithWeight(
+        GetValueBolderThan(font_list.GetFontWeight()));
     if (is_default_) {
       label_->SetFontList(cached_bold_font_list_);
       return;
     }
   }
   label_->SetFontList(cached_normal_font_list_);
 }
 
 void LabelButton::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
   label_->SetElideBehavior(elide_behavior);
@@ skipping 391 matching lines @@
 void LabelButton::ResetLabelEnabledColor() {
   const SkColor color =
       explicitly_set_colors_[state()]
           ? button_state_colors_[state()]
           : PlatformStyle::TextColorForButton(button_state_colors_, *this);
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
 }
 
 }  // namespace views