Use sk_sp-based picture recording APIs in Blink

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

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 53 matching lines @@
     ImageFrame* frame = imageDecoder->frameBufferAtIndex(0);
     if (!frame)
         return true;
     *result = frame->getSkBitmap();
     return true;
 }
 
 PassRefPtr<PictureSnapshot> PictureSnapshot::load(const Vector<RefPtr<TilePictureStream>>& tiles)
 {
     ASSERT(!tiles.isEmpty());
-    Vector<RefPtr<SkPicture>> pictures;
+    Vector<sk_sp<SkPicture>> pictures;
     pictures.reserveCapacity(tiles.size());
     FloatRect unionRect;
     for (const auto& tileStream : tiles) {
         SkMemoryStream stream(tileStream->data.begin(), tileStream->data.size());
-        RefPtr<SkPicture> picture = adoptRef(SkPicture::CreateFromStream(&stream, decodeBitmap));
+        sk_sp<SkPicture> picture = SkPicture::MakeFromStream(&stream, decodeBitmap);
         if (!picture)
             return nullptr;
         FloatRect cullRect(picture->cullRect());
         cullRect.moveBy(tileStream->layerOffset);
         unionRect.unite(cullRect);
-        pictures.append(picture);
+        pictures.append(std::move(picture));
     }
     if (tiles.size() == 1)
-        return adoptRef(new PictureSnapshot(pictures[0]));
+        return adoptRef(new PictureSnapshot(fromSkSp(std::move(pictures[0]))));
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(unionRect.width(), unionRect.height(), 0, 0);
     for (size_t i = 0; i < pictures.size(); ++i) {
         canvas->save();
         canvas->translate(tiles[i]->layerOffset.x() - unionRect.x(), tiles[i]->layerOffset.y() - unionRect.y());
         pictures[i]->playback(canvas, 0);
         canvas->restore();
     }
-    return adoptRef(new PictureSnapshot(adoptRef(recorder.endRecordingAsPicture())));
+    return adoptRef(new PictureSnapshot(fromSkSp(recorder.finishRecordingAsPicture())));
 }
 
 bool PictureSnapshot::isEmpty() const
 {
     return m_picture->cullRect().isEmpty();
 }
 
 PassOwnPtr<Vector<char>> PictureSnapshot::replay(unsigned fromStep, unsigned toStep, double scale) const
 {
     const SkIRect bounds = m_picture->cullRect().roundOut();
@@ skipping 61 matching lines @@
 
 PassRefPtr<JSONArray> PictureSnapshot::snapshotCommandLog() const
 {
     const SkIRect bounds = m_picture->cullRect().roundOut();
     LoggingCanvas canvas(bounds.width(), bounds.height());
     m_picture->playback(&canvas);
     return canvas.log();
 }
 
 } // namespace blink