Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

mojo/skia/ganesh_context.h

 // 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.
 
 #ifndef MOJO_SKIA_GANESH_CONTEXT_H_
 #define MOJO_SKIA_GANESH_CONTEXT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/gpu/gl_context.h"
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace mojo {
 namespace skia {
 
 // Binds a Ganesh rendering context to a GL context.
 //
 // Instances of this object is not thread-safe and must be used on the
 // same thread as the GL context was created on.
 class GaneshContext : public base::RefCounted<GaneshContext>,
@@ skipping 19 matching lines @@
     // Upon exit from the scope, flushes the Ganesh context state and
     // reactivates the prior GL context.
     ~Scope();
 
     // Gets the underlying Ganesh context, never null.
     const scoped_refptr<GaneshContext>& ganesh_context() const {
       return ganesh_context_;
     }
 
     // Gets the underlying Ganesh rendering context, never null.
-    const ::skia::RefPtr<GrContext>& gr_context() const {
+    const sk_sp<GrContext>& gr_context() const {
       return ganesh_context_->gr_context_;
     }
 
     // Gets the underlying GL context scope.
     //
     // Be careful when manipulating the GL context from within a Ganesh
     // scope since the Ganesh renderer caches GL state.  Queries are safe
     // but operations which modify the state of the GL context, such as binding
     // textures, should be followed by a call to |GrContext::resetContext|
     // before performing other Ganesh related actions within the scope.
@@ skipping 15 matching lines @@
   // Returns true if the GL context was lost.
   bool is_lost() const { return gl_context_->is_lost(); }
 
  private:
   friend class base::RefCounted<GaneshContext>;
 
   ~GaneshContext() override;
   void OnContextLost() override;
 
   const scoped_refptr<GLContext> gl_context_;
-  ::skia::RefPtr<GrContext> gr_context_;
+  sk_sp<GrContext> gr_context_;
   bool scope_entered_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(GaneshContext);
 };
 
 }  // namespace skia
 }  // namespace mojo
 
 #endif  // MOJO_SKIA_GANESH_CONTEXT_H_