cc: Move SkShader construction to a single spot in PaintShader

ui/native_theme/native_theme_base.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/native_theme/native_theme_base.h"
 
 #include <limits>
 #include <memory>
 
 #include "base/command_line.h"
@@ skipping 582 matching lines @@
     startEndColors = kCheckboxGradientPressedColors;
   else if (state == kHovered)
     startEndColors = kCheckboxGradientHoveredColors;
   else if (state == kDisabled)
     startEndColors = kCheckboxGradientDisabledColors;
   else /* kNormal */
     startEndColors = kCheckboxGradientColors;
   SkColor colors[3] = {startEndColors[0], startEndColors[0], startEndColors[1]};
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
-  flags.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
-      gradient_bounds, colors, NULL, 3, SkShader::kClamp_TileMode)));
+  flags.setShader(cc::PaintShader::MakeLinearGradient(
+      gradient_bounds, colors, nullptr, 3, SkShader::kClamp_TileMode));
   flags.setStyle(cc::PaintFlags::kFill_Style);
   canvas->drawRoundRect(skrect, borderRadius, borderRadius, flags);
-  flags.setShader(NULL);
+  flags.setShader(nullptr);
 
   // Draw the border.
   if (state == kHovered)
     flags.setColor(kCheckboxBorderHoveredColor);
   else if (state == kDisabled)
     flags.setColor(kCheckboxBorderDisabledColor);
   else
     flags.setColor(kCheckboxBorderColor);
   flags.setStyle(cc::PaintFlags::kStroke_Style);
   flags.setStrokeWidth(SkIntToScalar(1));
@@ skipping 56 matching lines @@
   SkPoint gradient_bounds[2] = {
     gfx::PointToSkPoint(rect.origin()),
     gfx::PointToSkPoint(rect.bottom_left() - gfx::Vector2d(0, 1))
   };
   if (state == kPressed)
     std::swap(gradient_bounds[0], gradient_bounds[1]);
   SkColor colors[2] = { light_color, base_color };
 
   flags.setStyle(cc::PaintFlags::kFill_Style);
   flags.setAntiAlias(true);
-  flags.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
-      gradient_bounds, colors, NULL, 2, SkShader::kClamp_TileMode)));
+  flags.setShader(cc::PaintShader::MakeLinearGradient(
+      gradient_bounds, colors, nullptr, 2, SkShader::kClamp_TileMode));
 
   canvas->drawRoundRect(skrect, SkIntToScalar(1), SkIntToScalar(1), flags);
-  flags.setShader(NULL);
+  flags.setShader(nullptr);
 
   if (button.has_border) {
     int border_alpha = state == kHovered ? 0x80 : 0x55;
     if (button.is_focused) {
       border_alpha = 0xff;
       flags.setColor(GetSystemColor(kColorId_FocusedBorderColor));
     }
     flags.setStyle(cc::PaintFlags::kStroke_Style);
     flags.setStrokeWidth(SkIntToScalar(1));
     flags.setAlpha(border_alpha);
@@ skipping 316 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace ui