Use sk_sp-based picture recording APIs in Blink

third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.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/graphics/paint/DisplayItemList.h"
 
 #include "SkPictureRecorder.h"
 #include "SkTypes.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/SubsequenceDisplayItem.h"
 #include "platform/graphics/paint/TransformDisplayItem.h"
+#include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/transforms/AffineTransform.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 namespace {
 
 #define EXPECT_RECT_EQ(expected, actual) \
     do { \
         const IntRect& actualRect = actual; \
         EXPECT_EQ(expected.x(), actualRect.x()); \
@@ skipping 18 matching lines @@
     DisplayItemList m_list;
     TestDisplayItemClient m_client;
 };
 
 static PassRefPtr<SkPicture> createRectPicture(const IntRect& bounds)
 {
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(bounds.width(), bounds.height());
     canvas->drawRect(SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height()),
         SkPaint());
-    return adoptRef(recorder.endRecordingAsPicture());
+    return fromSkSp(recorder.finishRecordingAsPicture());
 }
 
 TEST_F(DisplayItemListTest, AppendVisualRect_Simple)
 {
     // One drawing: D.
 
     IntRect drawingBounds(5, 6, 7, 8);
     m_list.allocateAndConstruct<DrawingDisplayItem>(
         m_client, DisplayItem::Type::DocumentBackground, createRectPicture(drawingBounds), true);
     m_list.appendVisualRect(drawingBounds);
@@ skipping 299 matching lines @@
     EXPECT_RECT_EQ(drawingABounds, m_list.visualRect(1));
     IntRect mergedTransformBounds(1, 2, 8, 8);
     EXPECT_RECT_EQ(mergedTransformBounds, m_list.visualRect(2));
     EXPECT_RECT_EQ(drawingBBounds, m_list.visualRect(3));
     EXPECT_RECT_EQ(mergedTransformBounds, m_list.visualRect(4));
     EXPECT_RECT_EQ(mergedSubsequenceBounds, m_list.visualRect(5));
 }
 
 } // namespace
 } // namespace blink