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

Unified Diff: ui/ozone/platform/drm/gpu/drm_console_buffer.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 | « ui/ozone/platform/drm/gpu/drm_buffer.cc ('k') | ui/ozone/platform/drm/gpu/drm_console_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_console_buffer.h
diff --git a/ui/ozone/platform/drm/gpu/drm_console_buffer.h b/ui/ozone/platform/drm/gpu/drm_console_buffer.h
index 27dc03855c218a28efe1cd9d874674f6de147ce3..ed46fffa9eef31e878af675bb68776a893b67c59 100644
--- a/ui/ozone/platform/drm/gpu/drm_console_buffer.h
+++ b/ui/ozone/platform/drm/gpu/drm_console_buffer.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/core/SkSurface.h"
class SkCanvas;
@@ -26,9 +26,7 @@ class DrmConsoleBuffer {
~DrmConsoleBuffer();
SkCanvas* canvas() { return surface_->getCanvas(); }
- skia::RefPtr<SkImage> image() {
- return skia::AdoptRef(surface_->newImageSnapshot());
- }
+ sk_sp<SkImage> image() { return surface_->makeImageSnapshot(); }
// Memory map the backing pixels and wrap them in |surface_|.
bool Initialize();
@@ -37,7 +35,7 @@ class DrmConsoleBuffer {
scoped_refptr<DrmDevice> drm_;
// Wrapper around the native pixel memory.
- skia::RefPtr<SkSurface> surface_;
+ sk_sp<SkSurface> surface_;
// Length of a row of pixels.
uint32_t stride_ = 0;
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_buffer.cc ('k') | ui/ozone/platform/drm/gpu/drm_console_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698