Allow various font weights in gfx.

ui/views/controls/styled_label.cc

 // Copyright 2013 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/styled_label.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <vector>
@@ skipping 36 matching lines @@
   } else {
     result.reset(new Label(text));
   }
 
   if (style_info.color != SK_ColorTRANSPARENT)
     result->SetEnabledColor(style_info.color);
   result->SetFontList(font_list);
 
   if (!style_info.tooltip.empty())
     result->SetTooltipText(style_info.tooltip);
-  if (style_info.font_style != gfx::Font::NORMAL) {
-    result->SetFontList(
-        result->font_list().DeriveWithStyle(style_info.font_style));
+  if (style_info.font_style != gfx::Font::NORMAL ||
+      style_info.weight != gfx::Font::Weight::NORMAL) {
+    result->SetFontList(result->font_list().Derive(0, style_info.font_style,
+                                                   style_info.weight));
   }
 
   return result;
 }
 
 }  // namespace
 
 
 // StyledLabel::RangeStyleInfo ------------------------------------------------
 
 StyledLabel::RangeStyleInfo::RangeStyleInfo()
     : font_style(gfx::Font::NORMAL),
+      weight(gfx::Font::Weight::NORMAL),
       color(SK_ColorTRANSPARENT),
       disable_line_wrapping(false),
       is_link(false) {}
 
 StyledLabel::RangeStyleInfo::~RangeStyleInfo() {}
 
 // static
 StyledLabel::RangeStyleInfo StyledLabel::RangeStyleInfo::CreateForLink() {
   RangeStyleInfo result;
   result.disable_line_wrapping = true;
@@ skipping 186 matching lines @@
 
     const size_t position = text_.size() - remaining_string.size();
 
     const gfx::Rect chunk_bounds(x, 0, width - x, 2 * line_height);
     std::vector<base::string16> substrings;
     gfx::FontList text_font_list = font_list_;
     // If the start of the remaining text is inside a styled range, the font
     // style may differ from the base font. The font specified by the range
     // should be used when eliding text.
     if (position >= range.start()) {
-      text_font_list = text_font_list.DeriveWithStyle(
-          current_range->style_info.font_style);
+      text_font_list =
+          text_font_list.Derive(0, current_range->style_info.font_style,
+                                current_range->style_info.weight);
     }
     gfx::ElideRectangleText(remaining_string,
                             text_font_list,
                             chunk_bounds.width(),
                             chunk_bounds.height(),
                             gfx::WRAP_LONG_WORDS,
                             &substrings);
 
     if (substrings.empty() || substrings[0].empty()) {
       // Nothing fits on this line. Start a new line.
@@ skipping 82 matching lines @@
   DCHECK_LE(used_width, width);
   // The user-specified line height only applies to interline spacing, so the
   // final line's height is unaffected.
   int total_height = line * line_height +
       CalculateLineHeight(font_list_) + GetInsets().height();
   calculated_size_ = gfx::Size(used_width + GetInsets().width(), total_height);
   return calculated_size_;
 }
 
 }  // namespace views