Allow various font weights in gfx.

ui/gfx/render_text.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 44 matching lines @@
 class GFX_EXPORT SkiaTextRenderer {
  public:
   explicit SkiaTextRenderer(Canvas* canvas);
   virtual ~SkiaTextRenderer();
 
   void SetDrawLooper(sk_sp<SkDrawLooper> draw_looper);
   void SetFontRenderParams(const FontRenderParams& params,
                            bool subpixel_rendering_suppressed);
   void SetTypeface(SkTypeface* typeface);
   void SetTextSize(SkScalar size);
-  void SetFontWithStyle(const Font& font, int font_style);
+  void SetFont(const Font& font, bool italic, gfx::Font::Weight weight);

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

   void SetForegroundColor(SkColor foreground);
   void SetShader(sk_sp<SkShader> shader);
   // Sets underline metrics to use if the text will be drawn with an underline.
   // If not set, default values based on the size of the text will be used. The
   // two metrics must be set together.
   void SetUnderlineMetrics(SkScalar thickness, SkScalar position);
   void DrawSelection(const std::vector<Rect>& selection, SkColor color);
   virtual void DrawPosText(const SkPoint* pos,
                            const uint16_t* glyphs,
                            size_t glyph_count);
@@ skipping 40 matching lines @@
   scoped_ptr<DiagonalStrike> diagonal_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer);
 };
 
 // Internal helper class used to iterate colors, baselines, and styles.
 class StyleIterator {
  public:
   StyleIterator(const BreakList<SkColor>& colors,
                 const BreakList<BaselineStyle>& baselines,
+                const BreakList<gfx::Font::Weight>& weights,

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

                 const std::vector<BreakList<bool>>& styles);
   ~StyleIterator();
 
   // Get the colors and styles at the current iterator position.
   SkColor color() const { return color_->second; }
   BaselineStyle baseline() const { return baseline_->second; }
   bool style(TextStyle s) const { return style_[s]->second; }
+  gfx::Font::Weight weight() const { return weight_->second; }

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

 
   // Get the intersecting range of the current iterator set.
   Range GetRange() const;
 
   // Update the iterator to point to colors and styles applicable at |position|.
   void UpdatePosition(size_t position);
 
  private:
   BreakList<SkColor> colors_;
   BreakList<BaselineStyle> baselines_;
+  BreakList<gfx::Font::Weight> weights_;

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

   std::vector<BreakList<bool> > styles_;
 
   BreakList<SkColor>::const_iterator color_;
   BreakList<BaselineStyle>::const_iterator baseline_;
+  BreakList<gfx::Font::Weight>::const_iterator weight_;

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

   std::vector<BreakList<bool>::const_iterator> style_;
 
   DISALLOW_COPY_AND_ASSIGN(StyleIterator);
 };
 
 // Line segments are slices of the display text to be rendered on a single line.
 struct LineSegment {
   LineSegment();
   ~LineSegment();
 
@@ skipping 22 matching lines @@
   // The sum of segment widths and the maximum of segment heights.
   SizeF size;
 
   // Sum of preceding lines' heights.
   int preceding_heights;
 
   // Maximum baseline of all segments on this line.
   int baseline;
 };
 
-// Creates an SkTypeface from a font and a |gfx::Font::FontStyle|.
-// May return NULL.
-skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style);
+// Creates an SkTypeface from a font, italic flag and weight. May return NULL.
+skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font,

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

+                                            bool italic,
+                                            gfx::Font::Weight weight);

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

 
 // Applies the given FontRenderParams to a Skia |paint|.
 void ApplyRenderParams(const FontRenderParams& params,
                        bool subpixel_rendering_suppressed,
                        SkPaint* paint);
 
 }  // namespace internal
 
 // RenderText represents an abstract model of styled text and its corresponding
 // visual layout. Support is built in for a cursor, a selection, simple styling,
@@ skipping 154 matching lines @@
   // The |range| should be valid, non-reversed, and within [0, text().length()].
   void SetBaselineStyle(BaselineStyle value);
   void ApplyBaselineStyle(BaselineStyle value, const Range& range);
 
   // Set various text styles over the entire text or a logical character range.
   // The respective |style| is applied if |value| is true, or removed if false.
   // The |range| should be valid, non-reversed, and within [0, text().length()].
   void SetStyle(TextStyle style, bool value);
   void ApplyStyle(TextStyle style, bool value, const Range& range);
 
+  void SetWeight(gfx::Font::Weight weight);

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

+  void ApplyWeight(gfx::Font::Weight weight, const Range& range);

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

+
   // Returns whether this style is enabled consistently across the entire
   // RenderText.
   bool GetStyle(TextStyle style) const;
 
   // Set or get the text directionality mode and get the text direction yielded.
   void SetDirectionalityMode(DirectionalityMode mode);
   DirectionalityMode directionality_mode() const {
       return directionality_mode_;
   }
   base::i18n::TextDirection GetDisplayTextDirection();
@@ skipping 103 matching lines @@
   RenderText();
 
   // NOTE: The value of these accessors may be stale. Please make sure
   // that these fields are up-to-date before accessing them.
   const base::string16& layout_text() const { return layout_text_; }
   const base::string16& display_text() const { return display_text_; }
   bool text_elided() const { return text_elided_; }
 
   const BreakList<SkColor>& colors() const { return colors_; }
   const BreakList<BaselineStyle>& baselines() const { return baselines_; }
+  const BreakList<gfx::Font::Weight>& weights() const { return weights_; }

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

   const std::vector<BreakList<bool> >& styles() const { return styles_; }
 
   const std::vector<internal::Line>& lines() const { return lines_; }
   void set_lines(std::vector<internal::Line>* lines) { lines_.swap(*lines); }
 
   // Returns the baseline of the current text.  The return value depends on
   // the text and its layout while the return value of GetBaseline() doesn't.
   // GetAlignmentOffset() takes into account the difference between them.
   //
   // We'd like a RenderText to show the text always on the same baseline
@@ skipping 235 matching lines @@
   bool focused_;
 
   // Composition text range.
   Range composition_range_;
 
   // Color, baseline, and style breaks, used to modify ranges of text.
   // BreakList positions are stored with text indices, not display indices.
   // TODO(msw): Expand to support cursor, selection, background, etc. colors.
   BreakList<SkColor> colors_;
   BreakList<BaselineStyle> baselines_;
+  BreakList<gfx::Font::Weight> weights_;

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

   std::vector<BreakList<bool> > styles_;
 
   // Breaks saved without temporary composition and selection styling.
   BreakList<SkColor> saved_colors_;
   BreakList<bool> saved_underlines_;
   bool composition_and_selection_styles_applied_;
 
   // A flag to obscure actual text with asterisks for password fields.
   bool obscured_;
   // The index at which the char should be revealed in the obscured text.
@@ skipping 67 matching lines @@
   // Lines computed by EnsureLayout. These should be invalidated upon
   // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
   std::vector<internal::Line> lines_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_