Chromium Code Reviews| 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..ff6051943a6ef30257c682733c5f96e6504af268 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; |
| + void SetHardwareCursor(gfx::AcceleratedWidget widget, |
|
dnicoara
2014/09/04 20:44:51
re-add virtual
spang
2014/09/09 20:19:44
Done.
|
| + 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); |
| }; |