Use sk_sp-based shader creation APIs

ui/views/style/mac/dialog_button_border_mac.cc

 // Copyright 2015 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/views/style/mac/dialog_button_border_mac.h"
 
 #include "base/logging.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
@@ skipping 20 matching lines @@
 // Vertical offset of the drop shadow and the inner highlight shadow.
 const SkScalar kShadowOffsetY = 1;
 
 // Shadow blur radius of the inner highlight shadow.
 const double kInnerShadowBlurRadius = 2.0;
 
 // Default border insets, to provide text padding.
 const int kPaddingX = 14;
 const int kPaddingY = 4;
 
-skia::RefPtr<SkShader> GetButtonGradient(int height,
+sk_sp<SkShader> GetButtonGradient(int height,

[danakj, 2016/03/25 18:18:09]

mind s/Get/Create/ while you're here?

[tomhudson, 2016/03/25 19:27:31]

Done.

                                          Button::ButtonState state) {
   ColorByState start = {0xFFF0F0F0, 0xFFF4F4F4, 0xFFEBEBEB, 0xFFEDEDED};
   ColorByState end = {0xFFE0E0E0, 0xFFE4E4E4, 0xFFDBDBDB, 0xFFDEDEDE};
 
   SkPoint gradient_points[2];
   gradient_points[0].iset(0, 0);
   gradient_points[1].iset(0, height);
 
   SkColor gradient_colors[] = {start[state], start[state], end[state]};
   SkScalar gradient_positions[] = {0.0, 0.38, 1.0};
 
-  skia::RefPtr<SkShader> gradient_shader =
-      skia::AdoptRef(SkGradientShader::CreateLinear(
+  return SkGradientShader::MakeLinear(
           gradient_points, gradient_colors, gradient_positions, 3,
-          SkShader::kClamp_TileMode));
-  return gradient_shader;
+          SkShader::kClamp_TileMode);
 }
 
 void DrawConstrainedButtonBackground(const SkRect& button_rect,
                                      SkCanvas* canvas,
                                      Button::ButtonState button_state) {
   // Extend the size of the SkRect so the border stroke is drawn over it on all
   // sides.
   SkRect rect(button_rect);
   rect.fRight += 1;
   rect.fBottom += 1;
 
   SkPaint paint;
 
   // Drop Shadow.
   ColorByState shadow = {0x14000000, 0x1F000000, 0x00000000, 0x00000000};
   const double blur = 0.0;
   std::vector<gfx::ShadowValue> shadows(
       1, gfx::ShadowValue(gfx::Vector2d(0, kShadowOffsetY), blur,
                           shadow[button_state]));
   skia::RefPtr<SkDrawLooper> looper = gfx::CreateShadowDrawLooper(shadows);
   paint.setLooper(looper.get());
 
   // Background.
-  skia::RefPtr<SkShader> gradient_shader =
-      GetButtonGradient(rect.height(), button_state);
-  paint.setShader(gradient_shader.get());
+  paint.setShader(GetButtonGradient(rect.height(), button_state));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setFlags(SkPaint::kAntiAlias_Flag);
   canvas->drawRoundRect(rect, kCornerRadius, kCornerRadius, paint);
 }
 
 // Draws an inner box shadow inside a rounded rectangle of size |rect|. The
 // technique: draw a black "ring" around the outside of the button cell. Then
 // clip out everything except the shadow it casts. Works similar to Blink's
 // GraphicsContext::drawInnerShadow().
 void DrawRoundRectInnerShadow(const SkRect& rect,
@@ skipping 64 matching lines @@
   else
     paint.setColor(border[button.state()]);
   canvas_skia->drawRoundRect(sk_rect, kCornerRadius, kCornerRadius, paint);
 }
 
 gfx::Size DialogButtonBorderMac::GetMinimumSize() const {
   return gfx::Size(100, 30);
 }
 
 }  // namespace views