Use sk_sp-based picture recording APIs

cc/layers/picture_layer.cc

 // Copyright 2012 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/layers/picture_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
@@ skipping 111 matching lines @@
     last_updated_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
-skia::RefPtr<SkPicture> PictureLayer::GetPicture() const {
+sk_sp<SkPicture> PictureLayer::GetPicture() const {
   // We could either flatten the DisplayListRecordingSource into a single
   // SkPicture, or paint a fresh one depending on what we intend to do with the
   // picture. For now we just paint a fresh one to get consistent results.
   if (!DrawsContent())
-    return skia::RefPtr<SkPicture>();
+    return nullptr;
 
   gfx::Size layer_size = bounds();
   scoped_ptr<DisplayListRecordingSource> recording_source(
       new DisplayListRecordingSource);
   Region recording_invalidation;
   recording_source->UpdateAndExpandInvalidation(
       client_, &recording_invalidation, layer_size, gfx::Rect(layer_size),
       update_source_frame_number_, DisplayListRecordingSource::RECORD_NORMALLY);
 
   scoped_refptr<DisplayListRasterSource> raster_source =
@@ skipping 93 matching lines @@
   if (update_source_frame_number_ != source_frame_number &&
       recording_source_bounds != layer_bounds) {
     // Update may not get called for the layer (if it's not in the viewport
     // for example), even though it has resized making the recording source no
     // longer valid. In this case just destroy the recording source.
     recording_source_->SetEmptyBounds();
   }
 }
 
 }  // namespace cc