Allow various font weights in gfx.

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
@@ skipping 204 matching lines @@
 };
 
 OmniboxResultView::OmniboxResultView(OmniboxPopupContentsView* model,
                                      int model_index,
                                      LocationBarView* location_bar_view,
                                      const gfx::FontList& font_list)
     : model_(model),
       model_index_(model_index),
       location_bar_view_(location_bar_view),
       font_list_(font_list),
-      font_height_(
-          std::max(font_list.GetHeight(),
-                   font_list.DeriveWithStyle(gfx::Font::BOLD).GetHeight())),
+      font_height_(std::max(
+          font_list.GetHeight(),
+          font_list.DeriveWithWeight(gfx::Font::Weight::BOLD).GetHeight())),
       mirroring_context_(new MirroringContext()),
       keyword_icon_(new views::ImageView()),
       animation_(new gfx::SlideAnimation(this)) {
   CHECK_GE(model_index, 0);
   if (default_icon_size_ == 0) {
     default_icon_size_ =
         location_bar_view_->GetThemeProvider()->GetImageSkiaNamed(
             AutocompleteMatch::TypeToIcon(
                 AutocompleteMatchType::URL_WHAT_YOU_TYPED))->width();
   }
@@ skipping 252 matching lines @@
     if (text_start >= text_length)
       break;
 
     const size_t text_end = (i < (classifications.size() - 1)) ?
         std::min(classifications[i + 1].offset, text_length) :
         text_length;
     const gfx::Range current_range(text_start, text_end);
 
     // Calculate style-related data.
     if (classifications[i].style & ACMatchClassification::MATCH)
-      render_text->ApplyStyle(gfx::BOLD, true, current_range);
+      render_text->ApplyWeight(gfx::Font::Weight::BOLD, current_range);
 
     ColorKind color_kind = TEXT;
     if (classifications[i].style & ACMatchClassification::URL) {
       color_kind = URL;
       // Consider logical string for domain "ABC.comי/hello" where ABC are
       // Hebrew (RTL) characters. This string should ideally show as
       // "CBA.com/hello". If we do not force LTR on URL, it will appear as
       // "com/hello.CBA".
       // With IDN and RTL TLDs, it might be okay to allow RTL rendering of URLs,
       // but it still has some pitfalls like :
@@ skipping 297 matching lines @@
                                                int text_type,
                                                bool is_bold) {
   if (text.empty())
     return;
   int offset = destination->text().length();
   gfx::Range range(offset, offset + text.length());
   destination->AppendText(text);
   const TextStyle& text_style = GetTextStyle(text_type);
   // TODO(dschuyler): follow up on the problem of different font sizes within
   // one RenderText.  Maybe with destination->SetFontList(...).
-  destination->ApplyStyle(gfx::BOLD, is_bold, range);
+  destination->ApplyWeight(gfx::Font::Weight::BOLD, range);

[Peter Kasting, 2016/03/26 00:56:51]

This looks wrong.  Should this be something like:

  destination->ApplyWeight(
      is_bold ? gfx::Font::Weight::BOLD : gfx::Font::Weight::NORMAL, range);

Or, if we don't need to toggle some regions explicitly to normal, maybe:

  if (is_bold)
    destination->ApplyWeight(gfx::Font::Weight::BOLD, range);

[Mikus, 2016/03/29 10:55:38]

Done.

   destination->ApplyColor(
       GetNativeTheme()->GetSystemColor(text_style.colors[GetState()]), range);
   destination->ApplyBaselineStyle(text_style.baseline, range);
 }
 
 int OmniboxResultView::StartMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->start_margin() : 0;
 }
 
 int OmniboxResultView::EndMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->end_margin() : 0;
 }