Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

mojo/skia/ganesh_texture_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 "mojo/skia/ganesh_texture_surface.h"
 
 #include <GLES2/gl2.h>
 
 #include "base/logging.h"
 #include "mojo/gpu/gl_texture.h"
@@ skipping 16 matching lines @@
 
   GrBackendTextureDesc desc;
   desc.fFlags = kRenderTarget_GrBackendTextureFlag;
   desc.fOrigin = kTopLeft_GrSurfaceOrigin;
   desc.fWidth = texture_->size().width;
   desc.fHeight = texture_->size().height;
   desc.fConfig = kSkia8888_GrPixelConfig;
   desc.fSampleCnt = 0;
   desc.fTextureHandle = reinterpret_cast<GrBackendObject>(&info);
 
-  surface_ = ::skia::AdoptRef(SkSurface::NewFromBackendTexture(
-      scope.gr_context().get(), desc, nullptr));
+  surface_ = SkSurface::MakeFromBackendTexture(scope.gr_context().get(), desc,
+                                               nullptr);
   DCHECK(surface_);
 }
 
 GaneshTextureSurface::~GaneshTextureSurface() {}
 
 std::unique_ptr<GLTexture> GaneshTextureSurface::TakeTexture() {
   surface_->getCanvas()->flush();
-  surface_.clear();
+  surface_.reset();
   return std::move(texture_);
 }
 
 }  // namespace skia
 }  // namespace mojo