DNCI [RenderText] Added font size options in RenderText.

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 <algorithm>
 #include <cstring>
 #include <string>
@@ skipping 94 matching lines @@
   SkScalar underline_thickness_;
   SkScalar underline_position_;
   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,
+  StyleIterator(const BreakList<uint32_t>& font_sizes,
+                const BreakList<SkColor>& colors,
                 const BreakList<BaselineStyle>& baselines,
                 const std::vector<BreakList<bool>>& styles);
   ~StyleIterator();
 
   // Get the colors and styles at the current iterator position.
+  uint32_t font_size() const { return font_size_->second; }
   SkColor color() const { return color_->second; }
   BaselineStyle baseline() const { return baseline_->second; }
   bool style(TextStyle s) const { return style_[s]->second; }
 
   // 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<uint32_t> font_sizes_;
   BreakList<SkColor> colors_;
   BreakList<BaselineStyle> baselines_;
   std::vector<BreakList<bool> > styles_;
 
+  BreakList<uint32_t>::const_iterator font_size_;
   BreakList<SkColor>::const_iterator color_;
   BreakList<BaselineStyle>::const_iterator baseline_;
   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();
@@ skipping 61 matching lines @@
 
   const base::string16& text() const { return text_; }
   void SetText(const base::string16& text);
   void AppendText(const base::string16& text);
 
   HorizontalAlignment horizontal_alignment() const {
     return horizontal_alignment_;
   }
   void SetHorizontalAlignment(HorizontalAlignment alignment);
 
+  VerticalAlignment vertical_alignment() const { return vertical_alignment_; }

[msw, 2015/03/26 23:07:28]

You should upload CLs that are rebased on your locally-applied pre-requisite
patches, otherwise this CL shows all the diffs from both CLs... Ping me when you
have a cleaner diff.

[dschuyler, 2015/03/27 21:32:13]

Done.

+  void SetVerticalAlignment(VerticalAlignment alignment);
+
   const FontList& font_list() const { return font_list_; }
   void SetFontList(const FontList& font_list);
 
   bool cursor_enabled() const { return cursor_enabled_; }
   void SetCursorEnabled(bool cursor_enabled);
 
   bool cursor_visible() const { return cursor_visible_; }
   void set_cursor_visible(bool visible) { cursor_visible_ = visible; }
 
   bool insert_mode() const { return insert_mode_; }
@@ skipping 104 matching lines @@
   void SelectAll(bool reversed);
 
   // Selects the word at the current cursor position. If there is a non-empty
   // selection, the selection bounds are extended to their nearest word
   // boundaries.
   void SelectWord();
 
   const Range& GetCompositionRange() const;
   void SetCompositionRange(const Range& composition_range);
 
+  // Set the font size over the entire text or a logical character range.
+  // The |range| should be valid, non-reversed, and within [0, text().length()].
+  // A |value| of zero will expand to the default font size.
+  void SetFontSize(uint32_t value);
+  void ApplyFontSize(uint32_t value, const Range& range);
+
   // Set the text color over the entire text or a logical character range.
   // The |range| should be valid, non-reversed, and within [0, text().length()].
   void SetColor(SkColor value);
   void ApplyColor(SkColor value, const Range& range);
 
   // Set the baseline style over the entire text or a logical character range.
   // The |range| should be valid, non-reversed, and within [0, text().length()].
   void SetBaselineStyle(BaselineStyle value);
   void ApplyBaselineStyle(BaselineStyle value, const Range& range);
 
@@ skipping 117 matching lines @@
 
  protected:
   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<uint32_t>& font_sizes() const { return font_sizes_; }
   const BreakList<SkColor>& colors() const { return colors_; }
   const BreakList<BaselineStyle>& baselines() const { return baselines_; }
   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.
@@ skipping 127 matching lines @@
 
  private:
   friend class RenderTextTest;
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, DefaultStyles);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SetStyles);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyStyles);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ObscuredText);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText);
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, FontSize);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
                            MoveCursorLeftRight_MeiryoUILigatures);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes);
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth);
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, VerticalAlignement);
 
   // Set the cursor to |position|, with the caret trailing the previous
   // grapheme, or if there is no previous grapheme, leading the cursor position.
   // If |select| is false, the selection start is moved to the same position.
   // If the |position| is not a cursorable position (not on grapheme boundary),
   // it is a NO-OP.
   void MoveCursorTo(size_t position, bool select);
 
   // Updates |layout_text_| and |display_text_| as needed (or marks them dirty).
   void OnTextAttributeChanged();
@@ skipping 16 matching lines @@
   // Draw the selection.
   void DrawSelection(Canvas* canvas);
 
   // Logical UTF-16 string data to be drawn.
   base::string16 text_;
 
   // Horizontal alignment of the text with respect to |display_rect_|.  The
   // default is to align left if the application UI is LTR and right if RTL.
   HorizontalAlignment horizontal_alignment_;
 
+  // Vertical alignment of the text with respect to |display_rect_|.  The
+  // default is to vertically align middle.
+  VerticalAlignment vertical_alignment_;
+
   // The text directionality mode, defaults to DIRECTIONALITY_FROM_TEXT.
   DirectionalityMode directionality_mode_;
 
   // The cached text direction, potentially computed from the text or UI locale.
   // Use GetTextDirection(), do not use this potentially invalid value directly!
   base::i18n::TextDirection text_direction_;
 
   // A list of fonts used to render |text_|.
   FontList font_list_;
 
@@ skipping 21 matching lines @@
   SkColor selection_background_focused_color_;
 
   // The focus state of the text.
   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.
+  BreakList<uint32_t> font_sizes_;
   // TODO(msw): Expand to support cursor, selection, background, etc. colors.
   BreakList<SkColor> colors_;
   BreakList<BaselineStyle> baselines_;
   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_;
 
@@ skipping 66 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_