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

Unified Diff: ui/ozone/platform/drm/test/mock_drm_device.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/screen_manager.cc ('k') | ui/ozone/platform/drm/test/mock_drm_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/test/mock_drm_device.h
diff --git a/ui/ozone/platform/drm/test/mock_drm_device.h b/ui/ozone/platform/drm/test/mock_drm_device.h
index a25bad9e91b1edfadf8e8d3ea232c554b4219198..eed66a1fb56bd3a6534d1f2ba8ccb6221d7432c9 100644
--- a/ui/ozone/platform/drm/test/mock_drm_device.h
+++ b/ui/ozone/platform/drm/test/mock_drm_device.h
@@ -9,7 +9,7 @@
#include <queue>
#include <vector>
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "ui/ozone/platform/drm/gpu/drm_device.h"
@@ -49,9 +49,7 @@ class MockDrmDevice : public ui::DrmDevice {
uint32_t current_framebuffer() const { return current_framebuffer_; }
- const std::vector<skia::RefPtr<SkSurface>> buffers() const {
- return buffers_;
- }
+ const std::vector<sk_sp<SkSurface>> buffers() const { return buffers_; }
uint32_t get_cursor_handle_for_crtc(uint32_t crtc) const {
const auto it = crtc_cursor_map_.find(crtc);
@@ -137,7 +135,7 @@ class MockDrmDevice : public ui::DrmDevice {
uint32_t current_framebuffer_;
- std::vector<skia::RefPtr<SkSurface>> buffers_;
+ std::vector<sk_sp<SkSurface>> buffers_;
std::map<uint32_t, uint32_t> crtc_cursor_map_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/screen_manager.cc ('k') | ui/ozone/platform/drm/test/mock_drm_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698