| Index: ui/gfx/render_text_unittest.cc
|
| diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
|
| index 70811227531791cf97872db9aa4a0ead4f82e685..ad7e8b2ee2f23825952fcb865cc42f3d746c5761 100644
|
| --- a/ui/gfx/render_text_unittest.cc
|
| +++ b/ui/gfx/render_text_unittest.cc
|
| @@ -336,16 +336,6 @@ class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
|
| 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 {}
|
| @@ -355,11 +345,6 @@ class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
|
| 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,
|
| @@ -381,17 +366,7 @@ class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
|
| 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);
|
| };
|
|
|