Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

mojo/skia/ganesh_context.h

Index: mojo/skia/ganesh_context.h
diff --git a/mojo/skia/ganesh_context.h b/mojo/skia/ganesh_context.h
index 0de655a5db3f0a4246f67b5879c0bce9cde06c79..472c7fd020958286525740ef3e9db24743f14ef8 100644
--- a/mojo/skia/ganesh_context.h
+++ b/mojo/skia/ganesh_context.h
@@ -8,7 +8,7 @@
 #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 {
@@ -48,7 +48,7 @@ class GaneshContext : public base::RefCounted<GaneshContext>,
     }
 
     // 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_;
     }
 
@@ -84,7 +84,7 @@ class GaneshContext : public base::RefCounted<GaneshContext>,
   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);