Add sk_sp helpers and switch Blink SkShader clients to the new APIs

third_party/WebKit/Source/platform/graphics/Gradient.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 215 matching lines @@
             m_gradientSpaceTransformation.translate(m_p0.x(), m_p0.y());
             m_gradientSpaceTransformation.scale(1, 1 / aspectRatio());
             m_gradientSpaceTransformation.translate(-m_p0.x(), -m_p0.y());
             ASSERT(m_p0 == m_p1);
         }
         SkMatrix localMatrix = affineTransformToSkMatrix(m_gradientSpaceTransformation);
 
         // Since the two-point radial gradient is slower than the plain radial,
         // only use it if we have to.
         if (m_p0 == m_p1 && m_r0 <= 0.0f) {
-            m_gradient = adoptRef(SkGradientShader::CreateRadial(m_p1.data(), m_r1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
+            m_gradient = fromSkSp(SkGradientShader::MakeRadial(m_p1.data(), m_r1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
         } else {
             // The radii we give to Skia must be positive. If we're given a
             // negative radius, ask for zero instead.
             SkScalar radius0 = m_r0 >= 0.0f ? WebCoreFloatToSkScalar(m_r0) : 0;
             SkScalar radius1 = m_r1 >= 0.0f ? WebCoreFloatToSkScalar(m_r1) : 0;
-            m_gradient = adoptRef(SkGradientShader::CreateTwoPointConical(m_p0.data(), radius0, m_p1.data(), radius1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
+            m_gradient = fromSkSp(SkGradientShader::MakeTwoPointConical(m_p0.data(), radius0, m_p1.data(), radius1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
         }
     } else {
         SkPoint pts[2] = { m_p0.data(), m_p1.data() };
         SkMatrix localMatrix = affineTransformToSkMatrix(m_gradientSpaceTransformation);
-        m_gradient = adoptRef(SkGradientShader::CreateLinear(pts, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
+        m_gradient = fromSkSp(SkGradientShader::MakeLinear(pts, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix));
     }
 
     if (!m_gradient) {
         // use last color, since our "geometry" was degenerate (e.g. radius==0)
-        m_gradient = adoptRef(SkShader::CreateColorShader(colors[countUsed - 1]));
+        m_gradient = fromSkSp(SkShader::MakeColorShader(colors[countUsed - 1]));
     }
     return m_gradient.get();
 }
 
 void Gradient::applyToPaint(SkPaint& paint)
 {
-    paint.setShader(shader());
+    paint.setShader(sk_ref_sp(shader()));

[Stephen White, 2016/03/18 14:48:27]

Perhaps m_gradient should be sk_sp<SkShader>, and shader() should return
sk_sp<Shader>, if it's only ever used for Skia calls. Then we could avoid the
fromSkSp() calls above, and the sk_ref_sp() here.

Doesn't have to be in this patch, though.

[f(malita), 2016/03/18 15:11:53]

I'm not sure what the right balance for Blink's sk_sp-ization is, I guess we're
still in the phase of figuring the optimal mix :)

Initially I started down the path of "let's just use sk_sp for all Skia refs in
Blink", but that quickly exploded into massive API refactorings because Skia
objects are pervasive these days.  Adding Skia includes to a gazillion Blink
headers didn't seem right, so I decided to back off that path.

My current thought is to use sk_sp for local/private refs, but don't expose it
in Blink's internal APIs.

In this particular case, I think the shader is private so it should be fine to
convert without spilling into other Blink parts.

Will do that in a follow-up.

 
     // Legacy behavior: gradients are always dithered.
     paint.setDither(true);
 }
+
 } // namespace blink