Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

mojo/skia/ganesh_context.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_context.h"
 
 #include "mojo/public/c/gpu/MGL/mgl.h"
 #include "mojo/skia/gl_bindings_skia.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
@@ skipping 10 matching lines @@
 
 GaneshContext::GaneshContext(const scoped_refptr<GLContext>& gl_context)
     : gl_context_(gl_context) {
   DCHECK(gl_context_);
   if (is_lost())
     return;
 
   gl_context_->AddObserver(this);
 
   GLContext::Scope gl_scope(gl_context_);
-  ::skia::RefPtr<GrGLInterface> interface =
-      ::skia::AdoptRef(CreateMojoSkiaGLBinding());
+  sk_sp<GrGLInterface> interface = CreateMojoSkiaGLBinding();
   DCHECK(interface);
-  gr_context_ = ::skia::AdoptRef(GrContext::Create(
+  gr_context_.reset(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
   DCHECK(gr_context_);
   gr_context_->setResourceCacheLimits(kMaxGaneshResourceCacheCount,
                                       kMaxGaneshResourceCacheBytes);
 }
 
 GaneshContext::~GaneshContext() {
   DCHECK(!scope_entered_);
   if (!gr_context_)
     return;
@@ skipping 10 matching lines @@
   }
 }
 
 void GaneshContext::OnContextLost() {
   DCHECK(gr_context_);
   DCHECK(is_lost());
 
   gl_context_->RemoveObserver(this);
   if (!scope_entered_) {
     gr_context_->abandonContext();
-    gr_context_.clear();
+    gr_context_.reset();
   }
 }
 
 GaneshContext::Scope::Scope(const scoped_refptr<GaneshContext>& ganesh_context)
     : ganesh_context_(ganesh_context), gl_scope_(ganesh_context->gl_context_) {
   DCHECK(!ganesh_context_->scope_entered_);
   DCHECK(ganesh_context_->gr_context_);
   DCHECK(!ganesh_context_->is_lost());
 
   // Do this first to avoid potential reentrance if the context is lost.
@@ skipping 11 matching lines @@
   // Flush the Ganesh context when exiting its scope to ensure all pending
   // operations have been applied to the GL context.
   if (!ganesh_context_->is_lost()) {
     ganesh_context_->gr_context_->flush();
   }
 
   // Abandon the Ganesh context if lost while inside the scope or while
   // flushing it above.
   if (ganesh_context_->is_lost()) {
     ganesh_context_->gr_context_->abandonContext();
-    ganesh_context_->gr_context_.clear();
+    ganesh_context_->gr_context_.reset();
   }
 
   // Do this last to avoid potential reentrance if the context is lost.
   ganesh_context_->scope_entered_ = false;
 }
 
 }  // namespace skia
 }  // namespace mojo