Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(591)

Unified Diff: mojo/skia/ganesh_context.h

Issue 2011713003: Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/ui/png_viewer/png_viewer.cc ('k') | mojo/skia/ganesh_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « examples/ui/png_viewer/png_viewer.cc ('k') | mojo/skia/ganesh_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698