Use sk_sp-based picture recording APIs

cc/playback/display_list_raster_source.cc

 // Copyright 2014 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 "cc/playback/display_list_raster_source.h"
 
 #include <stddef.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 242 matching lines @@
   DCHECK(display_list_.get());
   gfx::Rect canvas_target_playback_rect =
       canvas_playback_rect - canvas_bitmap_rect.OffsetFromOrigin();
   int repeat_count = std::max(1, slow_down_raster_scale_factor_for_debug_);
   for (int i = 0; i < repeat_count; ++i) {
     display_list_->Raster(canvas, callback, canvas_target_playback_rect,
                           contents_scale);
   }
 }
 
-skia::RefPtr<SkPicture> DisplayListRasterSource::GetFlattenedPicture() {
+sk_sp<SkPicture> DisplayListRasterSource::GetFlattenedPicture() {
   TRACE_EVENT0("cc", "DisplayListRasterSource::GetFlattenedPicture");
 
   gfx::Rect display_list_rect(size_);
   SkPictureRecorder recorder;
   SkCanvas* canvas = recorder.beginRecording(display_list_rect.width(),
                                              display_list_rect.height());
   if (!display_list_rect.IsEmpty()) {
     PrepareForPlaybackToCanvas(canvas, display_list_rect, display_list_rect,
                                1.f);
     RasterCommon(canvas, nullptr, display_list_rect, display_list_rect, 1.f);
   }
-  skia::RefPtr<SkPicture> picture =
-      skia::AdoptRef(recorder.endRecordingAsPicture());
 
-  return picture;
+  return recorder.finishRecordingAsPicture();
 }
 
 size_t DisplayListRasterSource::GetPictureMemoryUsage() const {
   if (!display_list_)
     return 0;
   return display_list_->ApproximateMemoryUsage() +
          painter_reported_memory_usage_;
 }
 
 bool DisplayListRasterSource::PerformSolidColorAnalysis(
@@ skipping 96 matching lines @@
     base::trace_event::MemoryAllocatorDump* dump =
         pmd->CreateAllocatorDump(dump_name);
     dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                     base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                     memory_usage);
   }
   return true;
 }
 
 }  // namespace cc