Rename paint data structures

ui/native_theme/native_theme_mac.mm

 // Copyright (c) 2013 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/native_theme/native_theme_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 234 matching lines @@
     case kColorId_TableGroupingIndicatorColor:
       return SkColorSetRGB(140, 140, 140);
 
     default:
       // TODO(tapted): Handle all values and remove the default case.
       return GetAuraColor(color_id, this);
   }
 }
 
 void NativeThemeMac::PaintMenuPopupBackground(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     const gfx::Size& size,
     const MenuBackgroundExtraParams& menu_background) const {
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setAntiAlias(true);
   if (base::mac::IsOS10_9())
     paint.setColor(kMenuPopupBackgroundColorMavericks);
   else
     paint.setColor(kMenuPopupBackgroundColor);
   const SkScalar radius = SkIntToScalar(menu_background.corner_radius);
   SkRect rect = gfx::RectToSkRect(gfx::Rect(size));
   canvas->drawRoundRect(rect, radius, radius, paint);
 }
 
 void NativeThemeMac::PaintMenuItemBackground(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& menu_item) const {
-  SkPaint paint;
+  cc::PaintFlags paint;
   switch (state) {
     case NativeTheme::kNormal:
     case NativeTheme::kDisabled:
       // Draw nothing over the regular background.
       break;
     case NativeTheme::kHovered:
       // TODO(tapted): Draw a gradient, and use [NSColor currentControlTint] to
       // pick colors. The System color "selectedMenuItemColor" is actually still
       // blue for Graphite. And while "keyboardFocusIndicatorColor" does change,
       // and is a good shade of gray, it's not blue enough for the Blue theme.
@@ skipping 77 matching lines @@
 
   for (size_t i = 0; i < arraysize(gradient_colors); ++i)
     gradient_colors[i] = ApplySystemControlTint(gradient_colors[i]);
 
   return SkGradientShader::MakeLinear(
       gradient_points, gradient_colors, gradient_positions,
       arraysize(gradient_positions), SkShader::kClamp_TileMode);
 }
 
 // static
-void NativeThemeMac::PaintStyledGradientButton(SkCanvas* canvas,
+void NativeThemeMac::PaintStyledGradientButton(cc::PaintCanvas* canvas,
                                                const gfx::Rect& integer_bounds,
                                                ButtonBackgroundType type,
                                                bool round_left,
                                                bool round_right,
                                                bool focus) {
   const SkScalar kBorderThickness = 1;
   const SkScalar kFocusRingThickness = 4;
   const SkColor kFocusRingColor = ApplySystemControlTint(
       SkColorSetARGB(0x94, 0x79, 0xa7, 0xe9));
 
@@ skipping 18 matching lines @@
   SkRRect shape;
   if (round_left && round_right)
     shape.setRectXY(bounds, kButtonCornerRadius, kButtonCornerRadius);
   else if (round_left)
     shape.setRectRadii(bounds, kLeftCurves);
   else if (round_right)
     shape.setRectRadii(bounds, kRightCurves);
   else
     shape.setRect(bounds);
 
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
+  cc::PaintFlags paint;
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setAntiAlias(true);
 
   // First draw the darker "outer" border, with its gradient and shadow. Inside
   // a tab strip, this will draw over the outer border and inner separator.
   paint.setLooper(gfx::CreateShadowDrawLooper(shadows));
-  paint.setShader(GetButtonBorderShader(type, shape.height()));
+  paint.setShader(
+      cc::WrapSkShader(GetButtonBorderShader(type, shape.height())));
   canvas->drawRRect(shape, paint);
 
   // Then, inset the rounded rect and draw over that with the inner gradient.
   shape.inset(kBorderThickness, kBorderThickness);
   paint.setLooper(nullptr);
-  paint.setShader(GetButtonBackgroundShader(type, shape.height()));
+  paint.setShader(
+      cc::WrapSkShader(GetButtonBackgroundShader(type, shape.height())));
   canvas->drawRRect(shape, paint);
 
   if (!focus)
     return;
 
   SkRRect outer_shape;
   shape.outset(kFocusRingThickness, kFocusRingThickness, &outer_shape);
   paint.setShader(nullptr);
   paint.setColor(kFocusRingColor);
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
 NativeThemeMac::NativeThemeMac() {
 }
 
 NativeThemeMac::~NativeThemeMac() {
 }
 
 }  // namespace ui