ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

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_
 #pragma once
 
 #include <algorithm>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/selection_model.h"
 
 class SkCanvas;
 struct SkPoint;
 
 namespace gfx {
 
-class Canvas;
+class CanvasSkia;
 class RenderTextTest;
 struct StyleRange;
 
 namespace internal {
 
 // Internal helper class used by derived classes to draw text through Skia.
 class SkiaTextRenderer {
  public:
-  explicit SkiaTextRenderer(Canvas* canvas);
+  explicit SkiaTextRenderer(CanvasSkia* canvas);
   ~SkiaTextRenderer();
 
   void SetFontSmoothingSettings(bool enable_smoothing, bool enable_lcd_text);
   void SetTypeface(SkTypeface* typeface);
   void SetTextSize(int size);
   void SetFont(const gfx::Font& font);
   void SetFontStyle(int font_style);
   void SetForegroundColor(SkColor foreground);
   void SetShader(SkShader* shader);
   void DrawSelection(const std::vector<Rect>& selection, SkColor color);
@@ skipping 193 matching lines @@
   virtual base::i18n::TextDirection GetTextDirection() = 0;
 
   // Returns the visual movement direction corresponding to the logical end
   // of the text, considering only the dominant direction returned by
   // |GetTextDirection()|, not the direction of a particular run.
   VisualCursorDirection GetVisualDirectionOfLogicalEnd();
 
   // Get the width of the entire string.
   virtual int GetStringWidth() = 0;
 
-  void Draw(Canvas* canvas);
+  void Draw(CanvasSkia* canvas);
 
   // Gets the SelectionModel from a visual point in local coordinates.
   virtual SelectionModel FindCursorPosition(const Point& point) = 0;
 
   // Get the visual bounds of a cursor at |selection|. These bounds typically
   // represent a vertical line, but if |insert_mode| is true they contain the
   // bounds of the associated glyph. These bounds are in local coordinates, but
   // may be outside the visible region if the text is longer than the textfield.
   // Subsequent text, cursor, or bounds changes may invalidate returned values.
   virtual Rect GetCursorBounds(const SelectionModel& selection,
@@ skipping 67 matching lines @@
   virtual bool IsCursorablePosition(size_t position) = 0;
 
   // Update the layout so that the next draw request can correctly
   // render the text and its attributes.
   virtual void UpdateLayout() = 0;
 
   // Ensure the text is laid out.
   virtual void EnsureLayout() = 0;
 
   // Draw the text.
-  virtual void DrawVisualText(Canvas* canvas) = 0;
+  virtual void DrawVisualText(CanvasSkia* canvas) = 0;
 
   // Like text() except that it returns asterisks or bullets if this is an
   // obscured field.
   string16 GetDisplayText() const;
 
   // Apply composition style (underline) to composition range and selection
   // style (foreground) to selection range.
   void ApplyCompositionAndSelectionStyles(StyleRanges* style_ranges);
 
   // Returns the text origin after applying text alignment and display offset.
@@ skipping 34 matching lines @@
   // 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);
 
   // Update the cached bounds and display offset to ensure that the current
   // cursor is within the visible display area.
   void UpdateCachedBoundsAndOffset();
 
   // Draw the selection and cursor.
-  void DrawSelection(Canvas* canvas);
-  void DrawCursor(Canvas* canvas);
+  void DrawSelection(CanvasSkia* canvas);
+  void DrawCursor(CanvasSkia* canvas);
 
   // Logical UTF-16 string data to be drawn.
   string16 text_;
 
   // Horizontal alignment of the text with respect to |display_rect_|.
   HorizontalAlignment horizontal_alignment_;
 
   // A list of fonts used to render |text_|.
   FontList font_list_;
 
@@ skipping 45 matching lines @@
   // The cached bounds and offset are invalidated by changes to the cursor,
   // selection, font, and other operations that adjust the visible text bounds.
   bool cached_bounds_and_offset_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_