Clean up cc/paint interfaces

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 204 matching lines @@
   } else {
     drawPattern(ctxt, srcRect, tileScaleFactor, patternPhase, op, dstRect,
                 spacing);
   }
 
   startAnimation();
 }
 
 namespace {
 
-sk_sp<PaintShader> createPatternShader(const SkImage* image,
+sk_sp<PaintShader> createPatternShader(sk_sp<const SkImage> image,
                                        const SkMatrix& shaderMatrix,
                                        const PaintFlags& paint,
                                        const FloatSize& spacing,
                                        SkShader::TileMode tmx,
                                        SkShader::TileMode tmy) {
   if (spacing.isZero())
     return MakePaintShaderImage(image, tmx, tmy, &shaderMatrix);
 
   // Arbitrary tiling is currently only supported for SkPictureShader, so we use
   // that instead of a plain bitmap shader to implement spacing.
@@ skipping 67 matching lines @@
   const auto tmy = computeTileMode(destRect.y(), destRect.maxY(), adjustedY,
                                    adjustedY + tileSize.height());
 
   PaintFlags flags = context.fillFlags();
   flags.setColor(SK_ColorBLACK);
   flags.setBlendMode(compositeOp);
   flags.setFilterQuality(
       context.computeFilterQuality(this, destRect, normSrcRect));
   flags.setAntiAlias(context.shouldAntialias());
   flags.setShader(
-      createPatternShader(image.get(), localMatrix, flags,
+      createPatternShader(std::move(image), localMatrix, flags,
                           FloatSize(repeatSpacing.width() / scale.width(),
                                     repeatSpacing.height() / scale.height()),
                           tmx, tmy));
   // If the shader could not be instantiated (e.g. non-invertible matrix),
   // draw transparent.
   // Note: we can't simply bail, because of arbitrary blend mode.
   if (!flags.getShader())
     flags.setColor(SK_ColorTRANSPARENT);
 
   context.drawRect(destRect, flags);
@@ skipping 54 matching lines @@
   FloatRect subset = dest;
   subset.setX((dest.x() - tile.x()) / scale.width());
   subset.setY((dest.y() - tile.y()) / scale.height());
   subset.setWidth(dest.width() / scale.width());
   subset.setHeight(dest.height() / scale.height());
 
   return subset;
 }
 
 }  // namespace blink