Allow various font weights in gfx.

ui/gfx/render_text_harfbuzz.h

 // Copyright 2014 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.
 
 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_
 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 16 matching lines @@
 namespace gfx {
 
 class Range;
 class RangeF;
 
 namespace internal {
 
 struct GFX_EXPORT TextRunHarfBuzz {
   // Construct the run with |template_font| since determining the details of a
   // default-constructed gfx::Font is expensive, but it will always be replaced.
-  explicit TextRunHarfBuzz(const gfx::Font& template_font);
+  explicit TextRunHarfBuzz(const Font& template_font);
   ~TextRunHarfBuzz();
 
   // Returns the index of the first glyph that corresponds to the character at
   // |pos|.
   size_t CharToGlyph(size_t pos) const;
 
   // Returns the corresponding glyph range of the given character range.
   // |range| is in text-space (0 corresponds to |GetDisplayText()[0]|). Returned
   // value is in run-space (0 corresponds to the first glyph in the run).
   Range CharRangeToGlyphRange(const Range& range) const;
@@ skipping 26 matching lines @@
   std::unique_ptr<SkPoint[]> positions;
   std::vector<uint32_t> glyph_to_char;
   size_t glyph_count;
 
   Font font;
   sk_sp<SkTypeface> skia_face;
   FontRenderParams render_params;
   int font_size;
   int baseline_offset;
   int baseline_type;
-  int font_style;
+  bool italic;
+  Font::Weight weight;
   bool strike;
   bool diagonal_strike;
   bool underline;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz);
 };
 
 // Manages the list of TextRunHarfBuzz and its logical <-> visual index mapping.
 class TextRunList {
@@ skipping 128 matching lines @@
   void ItemizeTextToRuns(const base::string16& string,
                          internal::TextRunList* run_list_out);
 
   // Helper method for ShapeRun() that calls ShapeRunWithFont() with |text|,
   // |run|, |font|, and |render_params|, returning true if the font provides
   // all the glyphs needed for |run|, and false otherwise. Additionally updates
   // |best_font|, |best_render_params|, and |best_missing_glyphs| if |font|
   // has fewer than |best_missing_glyphs| missing glyphs.
   bool CompareFamily(const base::string16& text,
                      const Font& font,
-                     const gfx::FontRenderParams& render_params,
+                     const FontRenderParams& render_params,
                      internal::TextRunHarfBuzz* run,
                      Font* best_font,
-                     gfx::FontRenderParams* best_render_params,
+                     FontRenderParams* best_render_params,
                      size_t* best_missing_glyphs);
 
   // Shape the glyphs of all runs in |run_list| using |text|.
   void ShapeRunList(const base::string16& text,
                     internal::TextRunList* run_list);
 
   // Shape the glyphs needed for the |run| within the |text|.
   void ShapeRun(const base::string16& text,
                 internal::TextRunHarfBuzz* run);
   bool ShapeRunWithFont(const base::string16& text,
@@ skipping 31 matching lines @@
 
   // Fixed width of glyphs. This should only be set in test environments.
   float glyph_width_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_HARFBUZZ_H_