Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

services/gfx/compositor/graph/snapshot.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 "services/gfx/compositor/graph/snapshot.h"
 
 #include "base/logging.h"
 #include "mojo/services/gfx/composition/cpp/formatting.h"
 #include "mojo/skia/type_converters.h"
 #include "services/gfx/compositor/graph/scene_content.h"
+#include "third_party/skia/include/core/SkMatrix44.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/utils/SkMatrix44.h"
 
 namespace compositor {
 
 Snapshot::Snapshot() {}
 
 Snapshot::~Snapshot() {}
 
 bool Snapshot::HasDependency(
     const mojo::gfx::composition::SceneToken& scene_token) const {
   return dependencies_.find(scene_token.value) != dependencies_.end();
 }
 
 scoped_refptr<RenderFrame> Snapshot::Paint(
     const RenderFrame::Metadata& metadata,
     const mojo::Rect& viewport) const {
   DCHECK(!is_blocked());
   DCHECK(root_scene_content_);
 
   SkIRect sk_viewport = viewport.To<SkIRect>();
 
   SkPictureRecorder recorder;
   recorder.beginRecording(SkRect::Make(sk_viewport));
   root_scene_content_->Paint(this, recorder.getRecordingCanvas());
   return new RenderFrame(metadata, sk_viewport,
-                         skia::AdoptRef(recorder.endRecordingAsPicture()));
+                         recorder.finishRecordingAsPicture());
 }
 
 void Snapshot::HitTest(const mojo::PointF& point,
                        mojo::gfx::composition::HitTestResult* result) const {
   DCHECK(result);
   DCHECK(!is_blocked());
   DCHECK(root_scene_content_);
 
   root_scene_content_->HitTest(this, point.To<SkPoint>(), SkMatrix44::I(),
                                &result->root);
@@ skipping 115 matching lines @@
   if (!snapshot_->is_blocked()) {
     snapshot_->root_scene_content_ = content;
   } else {
     snapshot_->resolved_scene_contents_.clear();
     snapshot_->node_dispositions_.clear();
   }
   return std::move(snapshot_);
 }
 
 }  // namespace compositor