[RenderText] Adding vertical alignment options

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 196 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_; }
+  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 36 matching lines @@
   // TODO(mukai): ELIDE_LONG_WORDS is not supported.
   WordWrapBehavior word_wrap_behavior() const { return word_wrap_behavior_; }
   void SetWordWrapBehavior(WordWrapBehavior behavior);
 
   // Set whether newline characters should be replaced with newline symbols.
   void SetReplaceNewlineCharsWithSymbols(bool replace);
 
   // Returns true if this instance supports multiline rendering.
   virtual bool MultilineSupported() const = 0;
 
   // TODO(ckocagil): Add vertical alignment and line spacing support instead.

[Jun Mukai, 2015/04/02 00:53:12]

Please remove this TODO.

   int min_line_height() const { return min_line_height_; }
   void SetMinLineHeight(int line_height);
 
   // Set the maximum length of the layout text, not the actual text.
   // A |length| of 0 forgoes a hard limit, but does not guarantee proper
   // functionality of very long strings. Applies to subsequent SetText calls.
   // WARNING: Only use this for system limits, it lacks complex text support.
   void set_truncate_length(size_t length) { truncate_length_ = length; }
 
   // The display text will be elided to fit |display_rect| using this behavior.
@@ skipping 356 matching lines @@
   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, VerticalAlignment);
 
   // 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 111 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_