Rename paint data structures

ui/gfx/skia_util.cc

Index: ui/gfx/skia_util.cc
diff --git a/ui/gfx/skia_util.cc b/ui/gfx/skia_util.cc
index 963e081369a7d8b068dbd46f2a1671bac7ba4383..62a8e9b0775ee101536487089d30ac7dafc04872 100644
--- a/ui/gfx/skia_util.cc
+++ b/ui/gfx/skia_util.cc
@@ -104,16 +104,16 @@ void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
   flattened->set(8, SkMScalarToScalar(transform.matrix().get(3, 3)));
 }
 
-sk_sp<SkShader> CreateImageRepShader(const gfx::ImageSkiaRep& image_rep,
-                                            SkShader::TileMode tile_mode,
+sk_sp<cc::PaintShader> CreateImageRepShader(const gfx::ImageSkiaRep& image_rep,
+                                            cc::PaintShader::TileMode tile_mode,
                                             const SkMatrix& local_matrix) {
-  return CreateImageRepShaderForScale(image_rep, tile_mode, local_matrix,
-                                      image_rep.scale());
+  return cc::WrapSkShader(CreateImageRepShaderForScale(
+      image_rep, tile_mode, local_matrix, image_rep.scale()));
 }
 
-sk_sp<SkShader> CreateImageRepShaderForScale(
+sk_sp<cc::PaintShader> CreateImageRepShaderForScale(
     const gfx::ImageSkiaRep& image_rep,
-    SkShader::TileMode tile_mode,
+    cc::PaintShader::TileMode tile_mode,
     const SkMatrix& local_matrix,
     SkScalar scale) {
   // Unscale matrix by |scale| such that the bitmap is drawn at the
@@ -128,11 +128,11 @@ sk_sp<SkShader> CreateImageRepShaderForScale(
   shader_scale.setScaleX(local_matrix.getScaleX() / scale);
   shader_scale.setScaleY(local_matrix.getScaleY() / scale);
 
-  return SkShader::MakeBitmapShader(
-      image_rep.sk_bitmap(), tile_mode, tile_mode, &shader_scale);
+  return cc::WrapSkShader(cc::PaintShader::MakeBitmapShader(
+      image_rep.sk_bitmap(), tile_mode, tile_mode, &shader_scale));
 }
 
-sk_sp<SkShader> CreateGradientShader(int start_point,
+sk_sp<cc::PaintShader> CreateGradientShader(int start_point,
                                             int end_point,
                                             SkColor start_color,
                                             SkColor end_color) {
@@ -141,8 +141,8 @@ sk_sp<SkShader> CreateGradientShader(int start_point,
   grad_points[0].iset(0, start_point);
   grad_points[1].iset(0, end_point);
 
-  return SkGradientShader::MakeLinear(
-      grad_points, grad_colors, NULL, 2, SkShader::kClamp_TileMode);
+  return cc::WrapSkShader(SkGradientShader::MakeLinear(
+      grad_points, grad_colors, NULL, 2, cc::PaintShader::kClamp_TileMode));
 }
 
 // TODO(estade): remove. Only exists to support legacy CreateShadowDrawLooper.