Rename paint data structures

ui/gfx/skia_util.cc

 // 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.
 
 #include "ui/gfx/skia_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/numerics/safe_conversions.h"
@@ skipping 86 matching lines @@
   flattened->set(1, SkMScalarToScalar(transform.matrix().get(0, 1)));
   flattened->set(2, SkMScalarToScalar(transform.matrix().get(0, 3)));
   flattened->set(3, SkMScalarToScalar(transform.matrix().get(1, 0)));
   flattened->set(4, SkMScalarToScalar(transform.matrix().get(1, 1)));
   flattened->set(5, SkMScalarToScalar(transform.matrix().get(1, 3)));
   flattened->set(6, SkMScalarToScalar(transform.matrix().get(3, 0)));
   flattened->set(7, SkMScalarToScalar(transform.matrix().get(3, 1)));
   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
   // correct density.
   // Convert skew and translation to pixel coordinates.
   // Thus, for |bitmap_scale| = 2:
   //   x scale = 2, x translation = 1 DIP,
   // should be converted to
   //   x scale = 1, x translation = 2 pixels.
   SkMatrix shader_scale = local_matrix;
   shader_scale.preScale(scale, scale);
   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) {
   SkColor grad_colors[2] = { start_color, end_color};
   SkPoint grad_points[2];
   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.
 static SkScalar DeprecatedRadiusToSigma(double radius) {
   // This captures historically what skia did under the hood. Now skia accepts
   // sigma, not radius, so we perform the conversion.
   return radius > 0 ? SkDoubleToScalar(0.57735f * radius + 0.5) : 0;
 }
 
 // This is copied from
@@ skipping 131 matching lines @@
   static const SkScalar kSkToHbRatio = SK_Scalar1 / kHbUnit1;
   return kSkToHbRatio * value;
 }
 
 float HarfBuzzUnitsToFloat(int value) {
   static const float kFloatToHbRatio = 1.0f / kHbUnit1;
   return kFloatToHbRatio * value;
 }
 
 }  // namespace gfx