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 18 matching lines @@
 
 // The default spacing between the icon and text.
 const int kSpacing = 5;
 
 #if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
 // Default text and shadow colors for STYLE_BUTTON.
 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;
   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 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();
 }
 
 // Ink drop container view that does not capture any events.
 class InkDropContainerView : public views::View {
  public:
   InkDropContainerView() {}
 
   // View:
   bool CanProcessEventsWithinSubtree() const override {
@@ skipping 94 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);

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

Use GetValueBolderThan here too.

 
   // 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