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

ui/gfx/render_text_unittest.cc

 // 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.
 
 #include "ui/gfx/render_text.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 318 matching lines @@
 // verify where exactly the glyphs are drawn.
 class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
  public:
   struct TextLog {
     TextLog() : glyph_count(0u), color(SK_ColorTRANSPARENT) {}
     PointF origin;
     size_t glyph_count;
     SkColor color;
   };
 
-  struct DecorationLog {
-    DecorationLog(int x, int y, int width, bool underline, bool strike)
-        : x(x), y(y), width(width), underline(underline), strike(strike) {}
-    int x;
-    int y;
-    int width;
-    bool underline;
-    bool strike;
-  };
-
   explicit TestSkiaTextRenderer(Canvas* canvas)
       : internal::SkiaTextRenderer(canvas) {}
   ~TestSkiaTextRenderer() override {}
 
   void GetTextLogAndReset(std::vector<TextLog>* text_log) {
     text_log_.swap(*text_log);
     text_log_.clear();
   }
 
-  void GetDecorationLogAndReset(std::vector<DecorationLog>* decoration_log) {
-    decoration_log_.swap(*decoration_log);
-    decoration_log_.clear();
-  }
-
  private:
   // internal::SkiaTextRenderer:
   void DrawPosText(const SkPoint* pos,
                    const uint16_t* glyphs,
                    size_t glyph_count) override {
     TextLog log_entry;
     log_entry.glyph_count = glyph_count;
     if (glyph_count > 0) {
       log_entry.origin =
           PointF(SkScalarToFloat(pos[0].x()), SkScalarToFloat(pos[0].y()));
       for (size_t i = 1U; i < glyph_count; ++i) {
         log_entry.origin.SetToMin(
             PointF(SkScalarToFloat(pos[i].x()), SkScalarToFloat(pos[i].y())));
       }
     }
     log_entry.color =
         test::RenderTextTestApi::GetRendererPaint(this).getColor();
     text_log_.push_back(log_entry);
     internal::SkiaTextRenderer::DrawPosText(pos, glyphs, glyph_count);
   }
 
-  void DrawDecorations(int x,
-                       int y,
-                       int width,
-                       bool underline,
-                       bool strike) override {
-    decoration_log_.push_back(DecorationLog(x, y, width, underline, strike));
-    internal::SkiaTextRenderer::DrawDecorations(x, y, width, underline, strike);
-  }
-
   std::vector<TextLog> text_log_;
-  std::vector<DecorationLog> decoration_log_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSkiaTextRenderer);
 };
 
 // Given a buffer to test against, this can be used to test various areas of the
 // rectangular buffer against a specific color value.
 class TestRectangleBuffer {
  public:
   TestRectangleBuffer(const wchar_t* string,
                       const SkColor* buffer,
@@ skipping 4260 matching lines @@
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 #endif
 
 INSTANTIATE_TEST_CASE_P(,
                         RenderTextHarfBuzzTest,
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 
 }  // namespace gfx