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

Unified Diff: ui/ozone/platform/caca/caca_window_manager.cc

Issue 1942973002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: trybots missed one missing include? Created 4 years, 8 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 | « no previous file | ui/ozone/platform/drm/gpu/drm_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/caca/caca_window_manager.cc
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc
index 7e1686f909f6ecf0e9b5f0b863718e642da63a37..da4466e2e2c1960f40310ed9a82d20671b4992f8 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/trace_event/trace_event.h"
#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "ui/gfx/skia_util.h"
#include "ui/gfx/vsync_provider.h"
@@ -28,7 +29,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
bool Initialize();
// ui::SurfaceOzoneCanvas overrides:
- skia::RefPtr<SkSurface> GetSurface() override;
+ sk_sp<SkSurface> GetSurface() override;
void ResizeCanvas(const gfx::Size& viewport_size) override;
void PresentCanvas(const gfx::Rect& damage) override;
std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
@@ -38,7 +39,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
ScopedCacaDither dither_;
- skia::RefPtr<SkSurface> surface_;
+ sk_sp<SkSurface> surface_;
DISALLOW_COPY_AND_ASSIGN(CacaSurface);
};
@@ -54,7 +55,7 @@ bool CacaSurface::Initialize() {
return true;
}
-skia::RefPtr<SkSurface> CacaSurface::GetSurface() {
+sk_sp<SkSurface> CacaSurface::GetSurface() {
return surface_;
}
@@ -68,7 +69,7 @@ void CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
kN32_SkColorType,
kPremul_SkAlphaType);
- surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
+ surface_ = SkSurface::MakeRaster(info);
if (!surface_)
LOG(ERROR) << "Failed to create SkSurface";
« no previous file with comments | « no previous file | ui/ozone/platform/drm/gpu/drm_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698