Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/noodles/noodles_view.cc

 // Copyright 2015 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 "examples/ui/noodles/noodles_view.h"
 
 #include <math.h>
 
 #include <cstdlib>
 #include <utility>
@@ skipping 91 matching lines @@
   metadata->presentation_time = frame_info.presentation_time;
   std::unique_ptr<Frame> frame(
       new Frame(size, CreatePicture(), metadata.Pass()));
   if (frame_queue_->PutFrame(std::move(frame))) {
     rasterizer_task_runner_->PostTask(
         FROM_HERE, base::Bind(&RasterizerDelegate::PublishNextFrame,
                               base::Unretained(rasterizer_delegate_.get())));
   }
 }
 
-skia::RefPtr<SkPicture> NoodlesView::CreatePicture() {
+sk_sp<SkPicture> NoodlesView::CreatePicture() {
   constexpr int count = 4;
   constexpr int padding = 1;
 
   if (alpha_ > kSecondsBetweenChanges) {
     alpha_ = 0.0;
     wx_ = rand() % 9 + 1;
     wy_ = rand() % 9 + 1;
   }
 
   const mojo::Size& size = *properties()->view_layout->size;
@@ skipping 10 matching lines @@
     SkScalar hsv[3] = {fmod(phase * 120, 360), 1, 1};
     paint.setColor(SkHSVToColor(hsv));
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setAntiAlias(true);
 
     SkPath path;
     Lissajous(&path, cx - padding, cy - padding, wx_, wy_, phase);
     canvas->drawPath(path, paint);
   }
 
-  return skia::AdoptRef(recorder.endRecordingAsPicture());
+  return recorder.finishRecordingAsPicture();
 }
 
 NoodlesView::FrameQueue::FrameQueue() {}
 
 NoodlesView::FrameQueue::~FrameQueue() {}
 
 bool NoodlesView::FrameQueue::PutFrame(std::unique_ptr<Frame> frame) {
   std::lock_guard<std::mutex> lock(mutex_);
   bool was_empty = !next_frame_.get();
   next_frame_.swap(frame);
@@ skipping 21 matching lines @@
       mojo::gfx::composition::ScenePtr::Create(std::move(scene_info))));
 }
 
 void NoodlesView::RasterizerDelegate::PublishNextFrame() {
   std::unique_ptr<Frame> frame(frame_queue_->TakeFrame());
   DCHECK(frame);
   rasterizer_->PublishFrame(std::move(frame));
 }
 
 }  // namespace examples