adding baseline options for super/sub scripting

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 91 matching lines @@
   Canvas* canvas_;
   SkCanvas* canvas_skia_;
   SkPaint paint_;
   SkScalar underline_thickness_;
   SkScalar underline_position_;
   scoped_ptr<DiagonalStrike> diagonal_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer);
 };
 
-// Internal helper class used by derived classes to iterate colors and styles.
+// Internal helper class used by derived classes to iterate colors, baselines,

[msw, 2015/02/18 23:32:08]

nit: remove "by derived classes" for a one-liner.

[dschuyler, 2015/02/19 00:29:14]

Done.

+// and styles.
 class StyleIterator {
  public:
   StyleIterator(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.
   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<SkColor> colors_;
+  BreakList<BaselineStyle> baselines_;
   std::vector<BreakList<bool> > styles_;
 
   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();
   ~LineSegment();
 
@@ skipping 179 matching lines @@
   void SelectWord();
 
   const Range& GetCompositionRange() const;
   void SetCompositionRange(const Range& composition_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.

[msw, 2015/02/18 23:32:08]

nit: remove the extra space before "baseline"

[dschuyler, 2015/02/19 00:29:14]

Done.

+  // 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);
 
   // Returns whether this style is enabled consistently across the entire
   // RenderText.
   bool GetStyle(TextStyle style) const;
 
@@ skipping 104 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<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.
   //
   // We'd like a RenderText to show the text always on the same baseline
@@ skipping 152 matching lines @@
   // 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();
 
+  // Make sure ranges don't break text graphemes.  If a range in |break_list|
+  // does break a  grapheme in |render_text|, the range will be slightly

[msw, 2015/02/18 23:32:08]

nit: remove the double space before "grapheme".

[dschuyler, 2015/02/19 00:29:14]

Done.

+  // extended to encompass the grapheme.
+  template <typename T>
+  void RestoreBreakList(RenderText* render_text,
+                        T& break_list);
+
   // Elides |text| as needed to fit in the |available_width| using |behavior|.
   // |text_width| is the pre-calculated width of the text shaped by this render
   // text, or pass 0 if the width is unknown.
   base::string16 Elide(const base::string16& text,
                        float text_width,
                        float available_width,
                        ElideBehavior behavior);
 
   // Elides |email| as needed to fit the |available_width|.
   base::string16 ElideEmail(const base::string16& email, float available_width);
@@ skipping 44 matching lines @@
 
   // The background color used for drawing the selection when focused.
   SkColor selection_background_focused_color_;
 
   // The focus state of the text.
   bool focused_;
 
   // Composition text range.
   Range composition_range_;
 
-  // Color and style breaks, used to color and stylize ranges of text.
+  // 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_;
   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 59 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_