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

Unified Diff: ui/ozone/platform/test/test_window_manager.cc

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/test/mock_drm_device.cc ('k') | ui/ozone/public/surface_ozone_canvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/test/test_window_manager.cc
diff --git a/ui/ozone/platform/test/test_window_manager.cc b/ui/ozone/platform/test/test_window_manager.cc
index cd48bf33eefdacdd347c4280c64bf5e31fc14aa3..ab57de8de29e2ac4b591e13aa3413dc30c00c5bf 100644
--- a/ui/ozone/platform/test/test_window_manager.cc
+++ b/ui/ozone/platform/test/test_window_manager.cc
@@ -36,10 +36,10 @@ class FileSurface : public SurfaceOzoneCanvas {
// SurfaceOzoneCanvas overrides:
void ResizeCanvas(const gfx::Size& viewport_size) override {
- surface_ = skia::AdoptRef(SkSurface::NewRaster(SkImageInfo::MakeN32Premul(
- viewport_size.width(), viewport_size.height())));
+ surface_ = SkSurface::MakeRaster(SkImageInfo::MakeN32Premul(
+ viewport_size.width(), viewport_size.height()));
}
- skia::RefPtr<SkSurface> GetSurface() override { return surface_; }
+ sk_sp<SkSurface> GetSurface() override { return surface_; }
void PresentCanvas(const gfx::Rect& damage) override {
if (location_.empty())
return;
@@ -59,7 +59,7 @@ class FileSurface : public SurfaceOzoneCanvas {
private:
base::FilePath location_;
- skia::RefPtr<SkSurface> surface_;
+ sk_sp<SkSurface> surface_;
};
} // namespace
« no previous file with comments | « ui/ozone/platform/drm/test/mock_drm_device.cc ('k') | ui/ozone/public/surface_ozone_canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698