Begin switch-over to using sk_sp (for SkShader for now)

This is not a complete conversion of setShader() sites, but is intended to be a canary, to tryout the new patterns. More will follow once this is approved.

BUG=skia:5077
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1778913002

Cr-Commit-Position: refs/heads/master@{#380613}

13 files changed, 35 insertions, 68 deletions

diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch/touch_hud_projection.cc
index af38df2..277cdd8 100644
--- a/ash/touch/touch_hud_projection.cc
+++ b/ash/touch/touch_hud_projection.cc
@@ -85,14 +85,10 @@ class TouchPointView : public views::View,
       alpha = static_cast<int>(fadeout_->CurrentValueBetween(alpha, 0));
     fill_paint_.setAlpha(alpha);
     stroke_paint_.setAlpha(alpha);
-    skia::RefPtr<SkShader> shader = skia::AdoptRef(
-        SkGradientShader::CreateRadial(gradient_center_,
-                                       SkIntToScalar(kPointRadius),
-                                       gradient_colors_,
-                                       gradient_pos_,
-                                       arraysize(gradient_colors_),
-                                       SkShader::kMirror_TileMode));
-    fill_paint_.setShader(shader.get());
+    fill_paint_.setShader(SkGradientShader::MakeRadial(
+        gradient_center_, SkIntToScalar(kPointRadius), gradient_colors_,
+        gradient_pos_, arraysize(gradient_colors_),
+        SkShader::kMirror_TileMode));
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
                        fill_paint_);
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc
index eafa30d..a6c3f07 100644
--- a/ash/wm/gestures/long_press_affordance_handler.cc
+++ b/ash/wm/gestures/long_press_affordance_handler.cc
@@ -103,16 +103,13 @@ void PaintAffordanceGlow(gfx::Canvas* canvas,
   int radius = (end_radius + start_radius) / 2;
   int glow_width = end_radius - start_radius;
   SkPoint sk_center(PointToSkPoint(center));
-  skia::RefPtr<SkShader> shader =
-      skia::AdoptRef(SkGradientShader::CreateTwoPointConical(
-          sk_center, SkIntToScalar(start_radius), sk_center,
-          SkIntToScalar(end_radius), colors, pos, num_colors,
-          SkShader::kClamp_TileMode));
-  DCHECK(shader);
   SkPaint paint;
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setStrokeWidth(glow_width);
-  paint.setShader(shader.get());
+  paint.setShader(SkGradientShader::MakeTwoPointConical(
+      sk_center, SkIntToScalar(start_radius), sk_center,
+      SkIntToScalar(end_radius), colors, pos, num_colors,
+      SkShader::kClamp_TileMode));
   paint.setAntiAlias(true);
   SkPath arc_path;
   arc_path.addArc(SkRect::MakeXYWH(center.x() - radius,
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 6606c0f..c5dc2ea 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -573,9 +573,7 @@ SkRect HeadsUpDisplayLayerImpl::DrawMemoryDisplay(SkCanvas* canvas,
   const SkScalar pos[] = {SkFloatToScalar(0.2f), SkFloatToScalar(0.4f),
                           SkFloatToScalar(0.6f), SkFloatToScalar(0.8f),
                           SkFloatToScalar(1.0f)};
-  skia::RefPtr<SkShader> gradient_shader =
-      skia::AdoptRef(SkGradientShader::CreateSweep(cx, cy, colors, pos, 5));
-  paint.setShader(gradient_shader.get());
+  paint.setShader(SkGradientShader::MakeSweep(cx, cy, colors, pos, 5));
   paint.setFlags(SkPaint::kAntiAlias_Flag);
 
   // Draw current status.
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 8e23961..a2a7c49 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -529,12 +529,10 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame,
     SkMatrix mask_mat;
     mask_mat.setRectToRect(mask_rect, dest_rect, SkMatrix::kFill_ScaleToFit);
 
-    skia::RefPtr<SkShader> mask_shader = skia::AdoptRef(
-        SkShader::CreateBitmapShader(*mask, SkShader::kClamp_TileMode,
-                                     SkShader::kClamp_TileMode, &mask_mat));
-
     SkPaint mask_paint;
-    mask_paint.setShader(mask_shader.get());
+    mask_paint.setShader(
+        SkShader::MakeBitmapShader(*mask, SkShader::kClamp_TileMode,
+                                   SkShader::kClamp_TileMode, &mask_mat));
 
     SkLayerRasterizer::Builder builder;
     builder.addLayer(mask_paint);
diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc
index 9a93fef..7e9fe10 100644
--- a/chrome/browser/ui/views/infobars/infobar_background.cc
+++ b/chrome/browser/ui/views/infobars/infobar_background.cc
@@ -29,15 +29,13 @@ void InfoBarBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   gradient_points[0].iset(0, 0);
   gradient_points[1].iset(0, view->height());
   SkColor gradient_colors[2] = { top_color_, bottom_color_ };
-  skia::RefPtr<SkShader> gradient_shader = skia::AdoptRef(
-      SkGradientShader::CreateLinear(gradient_points, gradient_colors, NULL, 2,
-                                     SkShader::kClamp_TileMode));
   SkPaint paint;
   paint.setStrokeWidth(
       SkIntToScalar(InfoBarContainerDelegate::kSeparatorLineHeight));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setStrokeCap(SkPaint::kRound_Cap);
-  paint.setShader(gradient_shader.get());
+  paint.setShader(SkGradientShader::MakeLinear(
+      gradient_points, gradient_colors, NULL, 2, SkShader::kClamp_TileMode));
 
   InfoBarView* infobar = static_cast<InfoBarView*>(view);
   SkCanvas* canvas_skia = canvas->sk_canvas();
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 3b5e36f..9f2d643 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -134,12 +134,11 @@ void DrawHighlight(gfx::Canvas* canvas,
                    SkScalar radius,
                    SkColor color) {
   const SkColor colors[2] = { color, SkColorSetA(color, 0) };
-  skia::RefPtr<SkShader> shader = skia::AdoptRef(SkGradientShader::CreateRadial(
-      p, radius, colors, nullptr, 2, SkShader::kClamp_TileMode));
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
-  paint.setShader(shader.get());
+  paint.setShader(SkGradientShader::MakeRadial(p, radius, colors, nullptr, 2,
+                                               SkShader::kClamp_TileMode));
   canvas->sk_canvas()->drawRect(
       SkRect::MakeXYWH(p.x() - radius, p.y() - radius, radius * 2, radius * 2),
       paint);
diff --git a/content/browser/web_contents/aura/shadow_layer_delegate.cc b/content/browser/web_contents/aura/shadow_layer_delegate.cc
index 067a147..a4a1660 100644
--- a/content/browser/web_contents/aura/shadow_layer_delegate.cc
+++ b/content/browser/web_contents/aura/shadow_layer_delegate.cc
@@ -42,14 +42,12 @@ void ShadowLayerDelegate::OnPaintLayer(const ui::PaintContext& context) {
   points[0].iset(0, 0);
   points[1].iset(kShadowThick, 0);
 
-  skia::RefPtr<SkShader> shader = skia::AdoptRef(
-      SkGradientShader::CreateLinear(points, kShadowColors, NULL,
-          arraysize(points), SkShader::kRepeat_TileMode));
-
   gfx::Rect paint_rect = gfx::Rect(0, 0, kShadowThick,
                                    layer_->bounds().height());
   SkPaint paint;
-  paint.setShader(shader.get());
+  paint.setShader(SkGradientShader::MakeLinear(points, kShadowColors, NULL,
+                                               arraysize(points),
+                                               SkShader::kRepeat_TileMode));
   ui::PaintRecorder recorder(context, layer_->size());
   recorder.canvas()->DrawRect(paint_rect, paint);
 }
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 80483eb..80b7df3 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -153,16 +153,10 @@ void Canvas::DrawDashedRect(const Rect& rect, SkColor color) {
     }
   }
 
-  // Make a shader for the bitmap with an origin of the box we'll draw. This
-  // shader is refcounted and will have an initial refcount of 1.
-  skia::RefPtr<SkShader> shader = skia::AdoptRef(
-      SkShader::CreateBitmapShader(
-          *dots, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode));
-  // Assign the shader to the paint & release our reference. The paint will
-  // now own the shader and the shader will be destroyed when the paint goes
-  // out of scope.
+  // Make a shader for the bitmap with an origin of the box we'll draw.
   SkPaint paint;
-  paint.setShader(shader.get());
+  paint.setShader(SkShader::MakeBitmapShader(*dots, SkShader::kRepeat_TileMode,
+                                             SkShader::kRepeat_TileMode));
 
   DrawRect(Rect(rect.x(), rect.y(), rect.width(), 1), paint);
   DrawRect(Rect(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1),
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
index 4da1497..9dbecee 100644
--- a/ui/native_theme/native_theme_base.cc
+++ b/ui/native_theme/native_theme_base.cc
@@ -616,12 +616,10 @@ SkRect NativeThemeBase::PaintCheckboxRadioCommon(
   else /* kNormal */
     startEndColors = kCheckboxGradientColors;
   SkColor colors[3] = {startEndColors[0], startEndColors[0], startEndColors[1]};
-  skia::RefPtr<SkShader> shader = skia::AdoptRef(
-      SkGradientShader::CreateLinear(
-          gradient_bounds, colors, NULL, 3, SkShader::kClamp_TileMode));
   SkPaint paint;
   paint.setAntiAlias(true);
-  paint.setShader(shader.get());
+  paint.setShader(SkGradientShader::MakeLinear(gradient_bounds, colors, NULL, 3,
+                                               SkShader::kClamp_TileMode));
   paint.setStyle(SkPaint::kFill_Style);
   canvas->drawRoundRect(skrect, borderRadius, borderRadius, paint);
   paint.setShader(NULL);
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 745af69..eef9df0 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -76,12 +76,9 @@ void SetCheckerboardShader(SkPaint* paint, const RECT& align_rect) {
   SkMatrix local_matrix;
   local_matrix.setTranslate(SkIntToScalar(align_rect.left),
                             SkIntToScalar(align_rect.top));
-  skia::RefPtr<SkShader> shader =
-      skia::AdoptRef(SkShader::CreateBitmapShader(bitmap,
-                                                  SkShader::kRepeat_TileMode,
-                                                  SkShader::kRepeat_TileMode,
-                                                  &local_matrix));
-  paint->setShader(shader.get());
+  paint->setShader(
+      SkShader::MakeBitmapShader(bitmap, SkShader::kRepeat_TileMode,
+                                 SkShader::kRepeat_TileMode, &local_matrix));
 }
 
 //    <-a->
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index 2c63883..e0aea82 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -103,11 +103,9 @@ void DrawGradientRect(const gfx::Rect& rect, SkColor start_color,
     points[1].iset(rect.width() + 1, 0);
   else
     points[1].iset(0, rect.height() + 1);
-  skia::RefPtr<SkShader> shader(skia::AdoptRef(
-      SkGradientShader::CreateLinear(points, colors, NULL, 2,
-                                     SkShader::kClamp_TileMode)));
   SkPaint paint;
-  paint.setShader(shader.get());
+  paint.setShader(SkGradientShader::MakeLinear(points, colors, NULL, 2,
+                                               SkShader::kClamp_TileMode));
   canvas->DrawRect(rect, paint);
 }
 
diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc
index 0a9fd12..0278e5b 100644
--- a/ui/views/controls/progress_bar.cc
+++ b/ui/views/controls/progress_bar.cc
@@ -82,9 +82,8 @@ void FillRoundRect(gfx::Canvas* canvas,
   } else {
     p[1].iset(x, y + h);
   }
-  skia::RefPtr<SkShader> s = skia::AdoptRef(SkGradientShader::CreateLinear(
-      p, colors, points, count, SkShader::kClamp_TileMode));
-  paint.setShader(s.get());
+  paint.setShader(SkGradientShader::MakeLinear(p, colors, points, count,
+                                               SkShader::kClamp_TileMode));
 
   canvas->DrawPath(path, paint);
 }
@@ -296,11 +295,9 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
             std::max(0, progress_width - kHighlightWidth - kBorderWidth);
         p[0].iset(highlight_left, 0);
         p[1].iset(progress_width, 0);
-        skia::RefPtr<SkShader> s =
-            skia::AdoptRef(SkGradientShader::CreateLinear(
-                p, highlight_colors, highlight_points,
-                arraysize(highlight_colors), SkShader::kClamp_TileMode));
-        paint.setShader(s.get());
+        paint.setShader(SkGradientShader::MakeLinear(
+            p, highlight_colors, highlight_points, arraysize(highlight_colors),
+            SkShader::kClamp_TileMode));
         paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
         canvas->DrawRect(gfx::Rect(highlight_left, 0,
                                    kHighlightWidth + kBorderWidth, bar_height),
diff --git a/ui/views/painter.cc b/ui/views/painter.cc
index 0cc1f0d..8e0d3e6 100644
--- a/ui/views/painter.cc
+++ b/ui/views/painter.cc
@@ -151,10 +151,9 @@ void GradientPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
   else
     p[1].iset(0, size.height());
 
-  skia::RefPtr<SkShader> s = skia::AdoptRef(SkGradientShader::CreateLinear(
+  paint.setShader(SkGradientShader::MakeLinear(
       p, colors_.get(), pos_.get(), count_, SkShader::kClamp_TileMode));
   paint.setStyle(SkPaint::kFill_Style);
-  paint.setShader(s.get());
 
   canvas->sk_canvas()->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
                                       SkIntToScalar(size.width()),