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

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

Issue 794603003: [Ozone] Fix build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « content/browser/compositor/software_output_device_ozone.cc ('k') | ui/ozone/platform/dri/dri_surface.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 05c509e8419c80787d1efc4a1301c5d015f67cb1..c543a9b67898f3fd36d2ee3300f8e690b3cf0d33 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -5,7 +5,6 @@
#include "ui/ozone/platform/caca/caca_window_manager.h"
#include "base/debug/trace_event.h"
-#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "ui/gfx/skia_util.h"
@@ -26,7 +25,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
bool Initialize();
// ui::SurfaceOzoneCanvas overrides:
- skia::RefPtr<SkCanvas> GetCanvas() override;
+ skia::RefPtr<SkSurface> GetSurface() override;
void ResizeCanvas(const gfx::Size& viewport_size) override;
void PresentCanvas(const gfx::Rect& damage) override;
scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
@@ -52,8 +51,8 @@ bool CacaSurface::Initialize() {
return true;
}
-skia::RefPtr<SkCanvas> CacaSurface::GetCanvas() {
- return skia::SharePtr<SkCanvas>(surface_->getCanvas());
+skia::RefPtr<SkSurface> CacaSurface::GetSurface() {
+ return surface_;
}
void CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
« no previous file with comments | « content/browser/compositor/software_output_device_ozone.cc ('k') | ui/ozone/platform/dri/dri_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698