RenderText: Allow strike-through line thickness to be customized.

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 45 matching lines @@
   explicit SkiaTextRenderer(Canvas* canvas);
   virtual ~SkiaTextRenderer();
 
   void SetDrawLooper(sk_sp<SkDrawLooper> draw_looper);
   void SetFontRenderParams(const FontRenderParams& params,
                            bool subpixel_rendering_suppressed);
   void SetTypeface(sk_sp<SkTypeface> typeface);
   void SetTextSize(SkScalar size);
   void SetForegroundColor(SkColor foreground);
   void SetShader(std::unique_ptr<cc::PaintShader> 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);
+  // Sets the ratio of strike-through line thickness to text height.
+  void SetStrikeThicknessFactor(SkScalar factor);
   void DrawSelection(const std::vector<Rect>& selection, SkColor color);
   virtual void DrawPosText(const SkPoint* pos,
                            const uint16_t* glyphs,
                            size_t glyph_count);
   // Draw underline and strike-through text decorations.
   // Based on |SkCanvas::DrawTextDecorations()| and constants from:
   //   third_party/skia/src/core/SkTextFormatParams.h
   virtual void DrawDecorations(int x,
                                int y,
                                int width,
                                bool underline,
                                bool strike);
   void DrawUnderline(int x, int y, int width);
   void DrawStrike(int x, int y, int width) const;
 
  private:
   friend class test::RenderTextTestApi;
 
   Canvas* canvas_;
   cc::PaintCanvas* canvas_skia_;
   cc::PaintFlags flags_;
   SkScalar underline_thickness_;

[msw, 2017/06/30 20:51:23]

Please also remove these two underline_* customization values.

[cjgrant, 2017/07/05 16:16:48]

Done.

   SkScalar underline_position_;
+  SkScalar strike_thickness_factor_;
 
   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<Font::Weight>& weights,
@@ skipping 390 matching lines @@
   // at the point, returns a nearby word. |baseline_point| should correspond to
   // the baseline point of the leftmost glyph of the |word| in the view's
   // coordinates. Returns false, if no word can be retrieved.
   bool GetDecoratedWordAtPoint(const Point& point,
                                DecoratedText* decorated_word,
                                Point* baseline_point);
 
   // Retrieves the text in the given |range|.
   base::string16 GetTextFromRange(const Range& range) const;
 
+  // Sets the ratio of strike-through line thickness to text height.
+  void SetStrikeThicknessFactor(SkScalar factor);
+
  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_; }
@@ skipping 315 matching lines @@
   // Text shadows to be drawn.
   ShadowValues shadows_;
 
   // A list of valid display text line break positions.
   BreakList<size_t> line_breaks_;
 
   // Lines computed by EnsureLayout. These should be invalidated upon
   // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
   std::vector<internal::Line> lines_;
 
+  SkScalar strike_thickness_factor_;

[msw, 2017/06/30 20:51:23]

nit: comment like "The ratio of strike-through line thickness to text height."
(I realize it's redundant with the setter, but I think it's more helpful here)

[cjgrant, 2017/07/05 16:16:48]

Done.  Agreed.

+
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_