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

Unified Diff: ui/ozone/platform/dri/dri_surface_factory.h

Issue 543643003: ozone: Plumb animated cursors from BitmapCursorFactoryOzone to DriSurfaceFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix dri_surface_factory_unittest Created 6 years, 3 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/dri/dri_cursor.cc ('k') | ui/ozone/platform/dri/dri_surface_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/dri_surface_factory.h
diff --git a/ui/ozone/platform/dri/dri_surface_factory.h b/ui/ozone/platform/dri/dri_surface_factory.h
index 5d2bc3c369dc417554082401298c36af4c08b0d7..6a377bc99be6645d9cbd6e122e9e50643b529e59 100644
--- a/ui/ozone/platform/dri/dri_surface_factory.h
+++ b/ui/ozone/platform/dri/dri_surface_factory.h
@@ -54,9 +54,10 @@ class DriSurfaceFactory : public SurfaceFactoryOzone,
SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
// HardwareCursorDelegate:
- virtual void SetHardwareCursor(gfx::AcceleratedWidget window,
- const SkBitmap& image,
- const gfx::Point& location) OVERRIDE;
+ virtual void SetHardwareCursor(gfx::AcceleratedWidget widget,
+ const std::vector<SkBitmap>& bitmaps,
+ const gfx::Point& location,
+ int frame_delay_ms) OVERRIDE;
virtual void MoveHardwareCursor(gfx::AcceleratedWidget window,
const gfx::Point& location) OVERRIDE;
@@ -72,8 +73,9 @@ class DriSurfaceFactory : public SurfaceFactoryOzone,
scoped_refptr<DriBuffer> cursor_buffers_[2];
int cursor_frontbuffer_;
- SkBitmap cursor_bitmap_;
+ std::vector<SkBitmap> cursor_bitmaps_;
gfx::Point cursor_location_;
+ int cursor_frame_delay_ms_;
DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
};
« no previous file with comments | « ui/ozone/platform/dri/dri_cursor.cc ('k') | ui/ozone/platform/dri/dri_surface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698