Use sk_sp-based picture recording APIs in Blink

third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp

 // Copyright 2016 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/testing/TestPaintArtifact.h"
 
 #include "cc/layers/layer.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/ForeignLayerDisplayItem.h"
 #include "platform/graphics/paint/PaintArtifact.h"
+#include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 class TestPaintArtifact::DummyRectClient : public DisplayItemClient {
     USING_FAST_MALLOC(DummyRectClient);
 public:
     DummyRectClient(const FloatRect& rect, Color color) : m_rect(rect), m_color(color) {}
     String debugName() const final { return "<dummy>"; }
     LayoutRect visualRect() const final { return enclosingLayoutRect(m_rect); }
     PassRefPtr<SkPicture> makePicture() const;
 private:
     FloatRect m_rect;
     Color m_color;
 };
 
 PassRefPtr<SkPicture> TestPaintArtifact::DummyRectClient::makePicture() const
 {
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(m_rect);
     SkPaint paint;
     paint.setColor(m_color.rgb());
     canvas->drawRect(m_rect, paint);
-    return adoptRef(recorder.endRecordingAsPicture());
+    return fromSkSp(recorder.finishRecordingAsPicture());
 }
 
 TestPaintArtifact::TestPaintArtifact()
     : m_displayItemList(0), m_built(false)
 {
 }
 
 TestPaintArtifact::~TestPaintArtifact()
 {
 }
@@ skipping 46 matching lines @@
         return m_paintArtifact;
 
     if (!m_paintChunks.isEmpty())
         m_paintChunks.last().endIndex = m_displayItemList.size();
     m_paintArtifact = PaintArtifact(std::move(m_displayItemList), std::move(m_paintChunks));
     m_built = true;
     return m_paintArtifact;
 }
 
 } // namespace blink