Use sk_sp-based picture recording APIs in Blink

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 181 matching lines @@
 
     // Arbitrary tiling is currently only supported for SkPictureShader - so we use it instead
     // of a plain bitmap shader to implement spacing.
     const SkRect tileRect = SkRect::MakeWH(
         image->width() + spacing.width(),
         image->height() + spacing.height());
 
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(tileRect);
     canvas->drawImage(image, 0, 0, &paint);
-    sk_sp<SkPicture> picture(recorder.endRecordingAsPicture());
 
-    return SkShader::MakePictureShader(
-        std::move(picture), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &shaderMatrix, nullptr);
+    return SkShader::MakePictureShader(recorder.finishRecordingAsPicture(),
+        SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &shaderMatrix, nullptr);
 }
 
 } // anonymous namespace
 
 void Image::drawPattern(GraphicsContext& context, const FloatRect& floatSrcRect, const FloatSize& scale,
     const FloatPoint& phase, SkXfermode::Mode compositeOp, const FloatRect& destRect, const FloatSize& repeatSpacing)
 {
     TRACE_EVENT0("skia", "Image::drawPattern");
 
     RefPtr<SkImage> image = imageForCurrentFrame();
@@ skipping 48 matching lines @@
     return image.release();
 }
 
 bool Image::isTextureBacked()
 {
     RefPtr<SkImage> image = imageForCurrentFrame();
     return image ? image->isTextureBacked() : false;
 }
 
 } // namespace blink