Allow various font weights in gfx.

ui/views/controls/button/label_button.cc

Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index f192e1282b258644d0a913accb63245831b2b5e4..ed7f64ae4cf58ee1aa9ea0ffcf2763d7510f39c5 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -36,6 +36,21 @@ const SkColor kStyleButtonTextColor = SK_ColorBLACK;
 const SkColor kStyleButtonShadowColor = SK_ColorWHITE;
 #endif
 
+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;
@@ -45,11 +60,13 @@ const gfx::FontList& GetDefaultNormalFontList() {
 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 18:24:11]

Remove this conditional now, it should handle any weight correctly.

[Mikus, 2016/03/23 17:53:22]

Done.

+    font_list.Get() = font_list.Get().DeriveWithWeight(
+        GetValueBolderThan(font_list.Get().GetFontWeight()));
+    DCHECK_GE(font_list.Get().GetFontWeight(), gfx::Font::Weight::BOLD);
   }
+
   return font_list.Get();
 }
 
@@ -164,8 +181,7 @@ const gfx::FontList& LabelButton::GetFontList() const {
 
 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);

[msw, 2016/03/22 18:24:11]

Use GetValueBolderThan here too.

 
   // STYLE_BUTTON uses bold text to indicate default buttons.
   label_->SetFontList(