Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/gpu/drm_buffer.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_buffer.h"
 
 #include "base/logging.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
@@ skipping 54 matching lines @@
   }
 
   if (should_register_framebuffer &&
       !drm_->AddFramebuffer(
           info.width(), info.height(), GetColorDepth(info.colorType()),
           info.bytesPerPixel() << 3, stride_, handle_, &framebuffer_)) {
     PLOG(ERROR) << "DrmBuffer: AddFramebuffer: handle " << handle_;
     return false;
   }
 
-  surface_ =
-      skia::AdoptRef(SkSurface::NewRasterDirect(info, mmap_base_, stride_));
+  surface_ = SkSurface::MakeRasterDirect(info, mmap_base_, stride_);
   if (!surface_) {
     LOG(ERROR) << "DrmBuffer: Failed to create SkSurface: handle " << handle_;
     return false;
   }
 
   return true;
 }
 
 SkCanvas* DrmBuffer::GetCanvas() const {
   return surface_->getCanvas();
@@ skipping 22 matching lines @@
     const gfx::Size& size) {
   scoped_refptr<DrmBuffer> buffer(new DrmBuffer(drm));
   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
   if (!buffer->Initialize(info, true /* should_register_framebuffer */))
     return NULL;
 
   return buffer;
 }
 
 }  // namespace ui