Allow various font weights in gfx.

chrome/browser/ui/libgtk2ui/gtk2_ui.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 "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <set>
 #include <utility>
@@ skipping 455 matching lines @@
     default:
       return views::LinuxUI::MIDDLE_CLICK_ACTION_LOWER;
   }
 }
 
 }  // namespace
 
 Gtk2UI::Gtk2UI()
     : default_font_size_pixels_(0),
       default_font_style_(gfx::Font::NORMAL),
+      default_font_weight_(gfx::Font::Weight::NORMAL),
       middle_click_action_(GetDefaultMiddleClickAction()),
       device_scale_factor_(1.0) {
   GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
 }
 
 
 
 void OnThemeChanged(GObject* obj, GParamSpec* param, Gtk2UI* gtkui) {
   gtkui->ResetStyle();
 }
@@ skipping 330 matching lines @@
 }
 
 gfx::FontRenderParams Gtk2UI::GetDefaultFontRenderParams() const {
   static gfx::FontRenderParams params = GetGtkFontRenderParams();
   return params;
 }
 
 void Gtk2UI::GetDefaultFontDescription(
     std::string* family_out,
     int* size_pixels_out,
-    int* style_out,
+    bool* italic_out,
+    gfx::Font::Weight* weight_out,
     gfx::FontRenderParams* params_out) const {
   *family_out = default_font_family_;
   *size_pixels_out = default_font_size_pixels_;
-  *style_out = default_font_style_;
+  *italic_out = (default_font_style_ & gfx::Font::ITALIC) != 0;
+  *weight_out = default_font_weight_;
   *params_out = default_font_render_params_;
 }
 
 ui::SelectFileDialog* Gtk2UI::CreateSelectFileDialog(
     ui::SelectFileDialog::Listener* listener,
     ui::SelectFilePolicy* policy) const {
   return SelectFileDialogImpl::Create(listener, policy);
 }
 
 bool Gtk2UI::UnityIsRunning() {
@@ skipping 506 matching lines @@
     // Non-absolute sizes are in points (again scaled by PANGO_SIZE).
     // Round the value when converting to pixels to match GTK's logic.
     const double size_points = pango_font_description_get_size(desc) /
         static_cast<double>(PANGO_SCALE);
     default_font_size_pixels_ = static_cast<int>(
         GetPixelsInPoint(device_scale_factor_) * size_points + 0.5);
     query.point_size = static_cast<int>(size_points);
   }
 
   query.style = gfx::Font::NORMAL;
-  // TODO(davemoore): Support weights other than bold?
-  if (pango_font_description_get_weight(desc) == PANGO_WEIGHT_BOLD)
-    query.style |= gfx::Font::BOLD;
+  query.weight =
+      static_cast<gfx::Font::Weight>(pango_font_description_get_weight(desc));
   // TODO(davemoore): What about PANGO_STYLE_OBLIQUE?
   if (pango_font_description_get_style(desc) == PANGO_STYLE_ITALIC)
     query.style |= gfx::Font::ITALIC;
 
   default_font_render_params_ =
       gfx::GetFontRenderParams(query, &default_font_family_);
   default_font_style_ = query.style;
 }
 
 void Gtk2UI::ResetStyle() {
@@ skipping 19 matching lines @@
   // Blacklist scaling factors <130% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
   return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }