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

chrome/browser/ui/views/autocomplete/autocomplete_result_view.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 CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_
 #pragma once
 
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
 class AutocompleteResultViewModel;
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 }
 
 class AutocompleteResultView : public views::View,
                                private ui::AnimationDelegate {
  public:
   enum ResultViewState {
     NORMAL = 0,
     SELECTED,
     HOVERED,
     NUM_STATES
@@ skipping 21 matching lines @@
   void SetMatch(const AutocompleteMatch& match);
 
   void ShowKeyword(bool show_keyword);
 
   void Invalidate();
 
   // views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
-  virtual void PaintMatch(gfx::Canvas* canvas,
+  virtual void PaintMatch(gfx::CanvasSkia* canvas,
                           const AutocompleteMatch& match,
                           int x);
 
   // Returns the height of the text portion of the result view. In the base
   // class, this is the height of one line of text.
   virtual int GetTextHeight() const;
 
   // Draws the specified |text| into the canvas, using highlighting provided by
   // |classifications|. If |force_dim| is true, ACMatchClassification::DIM is
   // added to all of the classifications. Returns the x position to the right
   // of the string.
-  int DrawString(gfx::Canvas* canvas,
+  int DrawString(gfx::CanvasSkia* canvas,
                  const string16& text,
                  const ACMatchClassifications& classifications,
                  bool force_dim,
                  int x,
                  int y);
 
   const gfx::Rect& text_bounds() const { return text_bounds_; }
 
  private:
   struct ClassificationData;
@@ skipping 22 matching lines @@
   //     LTR_STRING GNIRTS_LTR
   // If we need to elide the RTL run, then it will be drawn like:
   //     LTR_STRING ...RTS_LTR
   // Instead of:
   //     LTR_STRING RTS_LTR...
   void Elide(Runs* runs, int remaining_width) const;
 
   // views::View:
   virtual void Layout() OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
 
   // ui::AnimationDelegate:
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   static int default_icon_size_;
 
   // This row's model and model index.
   AutocompleteResultViewModel* model_;
   size_t model_index_;
 
@@ skipping 14 matching lines @@
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
   scoped_ptr<ui::SlideAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_