| Index: cc/layers/picture_layer.cc
|
| diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
|
| index af5cfb4585db168393a9471f6f97cbcd52e284c4..2763cf90975708652e8ad8918333c02691e79b5a 100644
|
| --- a/cc/layers/picture_layer.cc
|
| +++ b/cc/layers/picture_layer.cc
|
| @@ -129,12 +129,12 @@ 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(
|
|
|