Rename paint data structures

ui/native_theme/native_theme_base.h

Index: ui/native_theme/native_theme_base.h
diff --git a/ui/native_theme/native_theme_base.h b/ui/native_theme/native_theme_base.h
index ca838d4944be01d42026848740ec8548c677b311..0e4f233e2a02c6b0e5cc69b5dc14d283bdeb648d 100644
--- a/ui/native_theme/native_theme_base.h
+++ b/ui/native_theme/native_theme_base.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "skia/ext/platform_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "ui/native_theme/native_theme.h"
 
 namespace gfx {
@@ -27,7 +27,7 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme {
   gfx::Size GetPartSize(Part part,
                         State state,
                         const ExtraParams& extra) const override;
-  void Paint(SkCanvas* canvas,
+  void Paint(cc::PaintCanvas* canvas,
              Part part,
              State state,
              const gfx::Rect& rect,
@@ -38,98 +38,90 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme {
   ~NativeThemeBase() override;
 
   // Draw the arrow. Used by scrollbar and inner spin button.
-  virtual void PaintArrowButton(
-      SkCanvas* gc,
-      const gfx::Rect& rect,
-      Part direction,
-      State state) const;
+  virtual void PaintArrowButton(cc::PaintCanvas* gc,
+                                const gfx::Rect& rect,
+                                Part direction,
+                                State state) const;
   // Paint the scrollbar track. Done before the thumb so that it can contain
   // alpha.
   virtual void PaintScrollbarTrack(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       Part part,
       State state,
       const ScrollbarTrackExtraParams& extra_params,
       const gfx::Rect& rect) const;
   // Draw the scrollbar thumb over the track.
   virtual void PaintScrollbarThumb(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       Part part,
       State state,
       const gfx::Rect& rect,
       NativeTheme::ScrollbarOverlayColorTheme theme) const;
 
-  virtual void PaintScrollbarCorner(SkCanvas* canvas,
+  virtual void PaintScrollbarCorner(cc::PaintCanvas* canvas,
                                     State state,
                                     const gfx::Rect& rect) const;
 
-  virtual void PaintCheckbox(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const ButtonExtraParams& button) const;
+  virtual void PaintCheckbox(cc::PaintCanvas* canvas,
+                             State state,
+                             const gfx::Rect& rect,
+                             const ButtonExtraParams& button) const;
 
-  virtual void PaintRadio(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const ButtonExtraParams& button) const;
+  virtual void PaintRadio(cc::PaintCanvas* canvas,
+                          State state,
+                          const gfx::Rect& rect,
+                          const ButtonExtraParams& button) const;
 
-  virtual void PaintButton(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const ButtonExtraParams& button) const;
+  virtual void PaintButton(cc::PaintCanvas* canvas,
+                           State state,
+                           const gfx::Rect& rect,
+                           const ButtonExtraParams& button) const;
 
-  virtual void PaintTextField(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const TextFieldExtraParams& text) const;
+  virtual void PaintTextField(cc::PaintCanvas* canvas,
+                              State state,
+                              const gfx::Rect& rect,
+                              const TextFieldExtraParams& text) const;
 
-  virtual void PaintMenuList(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const MenuListExtraParams& menu_list) const;
+  virtual void PaintMenuList(cc::PaintCanvas* canvas,
+                             State state,
+                             const gfx::Rect& rect,
+                             const MenuListExtraParams& menu_list) const;
 
   virtual void PaintMenuPopupBackground(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       const gfx::Size& size,
       const MenuBackgroundExtraParams& menu_background) const;
 
   virtual void PaintMenuItemBackground(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const MenuItemExtraParams& menu_item) const;
 
   virtual void PaintMenuSeparator(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const MenuSeparatorExtraParams& menu_separator) const;
 
-  virtual void PaintSliderTrack(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const SliderExtraParams& slider) const;
+  virtual void PaintSliderTrack(cc::PaintCanvas* canvas,
+                                State state,
+                                const gfx::Rect& rect,
+                                const SliderExtraParams& slider) const;
 
-  virtual void PaintSliderThumb(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const SliderExtraParams& slider) const;
+  virtual void PaintSliderThumb(cc::PaintCanvas* canvas,
+                                State state,
+                                const gfx::Rect& rect,
+                                const SliderExtraParams& slider) const;
 
   virtual void PaintInnerSpinButton(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const InnerSpinButtonExtraParams& spin_button) const;
 
   virtual void PaintProgressBar(
-      SkCanvas* canvas,
+      cc::PaintCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const ProgressBarExtraParams& progress_bar) const;
@@ -157,7 +149,7 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme {
                               SkScalar brighten_amount) const;
 
   // Paints the arrow used on the scrollbar and spinner.
-  void PaintArrow(SkCanvas* canvas,
+  void PaintArrow(cc::PaintCanvas* canvas,
                   const gfx::Rect& rect,
                   Part direction,
                   SkColor color) const;
@@ -173,19 +165,19 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme {
   SkPath PathForArrow(const gfx::Rect& rect, Part direction) const;
   gfx::Rect BoundingRectForArrow(const gfx::Rect& rect) const;
 
-  void DrawVertLine(SkCanvas* canvas,
+  void DrawVertLine(cc::PaintCanvas* canvas,
                     int x,
                     int y1,
                     int y2,
-                    const SkPaint& paint) const;
-  void DrawHorizLine(SkCanvas* canvas,
+                    const cc::PaintFlags& paint) const;
+  void DrawHorizLine(cc::PaintCanvas* canvas,
                      int x1,
                      int x2,
                      int y,
-                     const SkPaint& paint) const;
-  void DrawBox(SkCanvas* canvas,
+                     const cc::PaintFlags& paint) const;
+  void DrawBox(cc::PaintCanvas* canvas,
                const gfx::Rect& rect,
-               const SkPaint& paint) const;
+               const cc::PaintFlags& paint) const;
   SkScalar Clamp(SkScalar value,
                  SkScalar min,
                  SkScalar max) const;
@@ -193,11 +185,10 @@ class NATIVE_THEME_EXPORT NativeThemeBase : public NativeTheme {
 
   // Paint the common parts of the checkboxes and radio buttons.
   // borderRadius specifies how rounded the corners should be.
-  SkRect PaintCheckboxRadioCommon(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const SkScalar borderRadius) const;
+  SkRect PaintCheckboxRadioCommon(cc::PaintCanvas* canvas,
+                                  State state,
+                                  const gfx::Rect& rect,
+                                  const SkScalar borderRadius) const;
 
   // The length of the arrow buttons, 0 means no buttons are drawn.
   int scrollbar_button_length_;