Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/gpu/drm_surface.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 "ui/ozone/platform/drm/gpu/drm_surface.h"
 
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 25 matching lines @@
 }  // namespace
 
 DrmSurface::DrmSurface(DrmWindow* window_delegate)
     : window_delegate_(window_delegate),
       weak_ptr_factory_(this) {
 }
 
 DrmSurface::~DrmSurface() {
 }
 
-skia::RefPtr<SkSurface> DrmSurface::GetSurface() {
+sk_sp<SkSurface> DrmSurface::GetSurface() {
   return surface_;
 }
 
 void DrmSurface::ResizeCanvas(const gfx::Size& viewport_size) {
   SkImageInfo info = SkImageInfo::MakeN32(
       viewport_size.width(), viewport_size.height(), kOpaque_SkAlphaType);
-  surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
+  surface_ = SkSurface::MakeRaster(info);
 
   HardwareDisplayController* controller = window_delegate_->GetController();
   if (!controller)
     return;
 
   // For the display buffers use the mode size since a |viewport_size| smaller
   // than the display size will not scanout.
   front_buffer_ = AllocateBuffer(controller->GetAllocationDrmDevice(),
                                  controller->GetModeSize());
   back_buffer_ = AllocateBuffer(controller->GetAllocationDrmDevice(),
                                 controller->GetModeSize());
 }
 
 void DrmSurface::PresentCanvas(const gfx::Rect& damage) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Create a snapshot of the requested drawing. If we get here again before
   // presenting, just add the additional damage.
   pending_image_damage_.Union(damage);
-  pending_image_ = skia::AdoptRef(surface_->newImageSnapshot());
+  pending_image_ = surface_->makeImageSnapshot();
 
   if (!pending_pageflip_)
     SchedulePageFlip();
 }
 
 scoped_ptr<gfx::VSyncProvider> DrmSurface::CreateVSyncProvider() {
   return make_scoped_ptr(new DrmVSyncProvider(window_delegate_));
 }
 
 void DrmSurface::SchedulePageFlip() {
@@ skipping 23 matching lines @@
 
 void DrmSurface::OnPageFlip(gfx::SwapResult result) {
   pending_pageflip_ = false;
   if (!pending_image_)
     return;
 
   SchedulePageFlip();
 }
 
 }  // namespace ui