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

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

 // Copyright 2014 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 "platform/graphics/ImagePattern.h"
 
 #include "platform/graphics/Image.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ skipping 15 matching lines @@
         // TODO(fmalita): mechanism to extract the actual SkImageInfo from an SkImage?
         const SkImageInfo info =
             SkImageInfo::MakeN32Premul(m_tileImage->width(), m_tileImage->height());
         adjustExternalMemoryAllocated(info.getSafeSize(info.minRowBytes()));
     }
 }
 
 PassRefPtr<SkShader> ImagePattern::createShader()
 {
     if (!m_tileImage)
-        return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT));
+        return adoptSkSp(SkShader::MakeColorShader(SK_ColorTRANSPARENT));

[Stephen White, 2016/03/17 17:50:40]

Bikeshed: I'd actually to avoid "adopt" here, ("skSpToPassRefPtr" or "fromSkSp"
or "toPassRefPtr" or something), since adopt to me means adopting a bare
pointer.

[f(malita), 2016/03/17 18:04:42]

Since jbroman also suggested fromSkSp, fromSkSp it is :)

Done.

 
     SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);
 
     if (isRepeatXY()) {
         // Fast path: for repeatXY we just return a shader from the original image.
-        return adoptRef(m_tileImage->newShader(SkShader::kRepeat_TileMode,
+        return adoptSkSp(m_tileImage->makeShader(SkShader::kRepeat_TileMode,
             SkShader::kRepeat_TileMode, &localMatrix));
     }
 
     // Skia does not have a "draw the tile only once" option. Clamp_TileMode
     // repeats the last line of the image after drawing one tile. To avoid
     // filling the space with arbitrary pixels, this workaround forces the
     // image to have a line of transparent pixels on the "repeated" edge(s),
     // thus causing extra space to be transparent filled.
     SkShader::TileMode tileModeX = isRepeatX()
         ? SkShader::kRepeat_TileMode : SkShader::kClamp_TileMode;
     SkShader::TileMode tileModeY = isRepeatY()
         ? SkShader::kRepeat_TileMode : SkShader::kClamp_TileMode;
     int expandW = isRepeatX() ? 0 : 1;
     int expandH = isRepeatY() ? 0 : 1;
 
     // Create a transparent image 1 pixel wider and/or taller than the
     // original, then copy the orignal into it.
     // FIXME: Is there a better way to pad (not scale) an image in skia?
     RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul(
         m_tileImage->width() + expandW, m_tileImage->height() + expandH));
     if (!surface)
-        return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT));
+        return adoptSkSp(SkShader::MakeColorShader(SK_ColorTRANSPARENT));
 
     surface->getCanvas()->clear(SK_ColorTRANSPARENT);
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     surface->getCanvas()->drawImage(m_tileImage.get(), 0, 0, &paint);
     RefPtr<SkImage> expandedImage = adoptRef(surface->newImageSnapshot());
 
-    return adoptRef(expandedImage->newShader(tileModeX, tileModeY, &localMatrix));
+    return adoptSkSp(expandedImage->makeShader(tileModeX, tileModeY, &localMatrix));
 }
 
 bool ImagePattern::isTextureBacked() const
 {
     return m_tileImage && m_tileImage->isTextureBacked();
 }
 
 } // namespace blink