ozone: Plumb animated cursors from BitmapCursorFactoryOzone to DriSurfaceFactory

ui/ozone/platform/dri/dri_surface_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 36 matching lines @@
   void ShutdownHardware();
 
   // SurfaceFactoryOzone:
   virtual scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
       gfx::AcceleratedWidget widget) OVERRIDE;
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       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;
 
  protected:
   // Draw the last set cursor & update the cursor plane.
   void ResetCursor(gfx::AcceleratedWidget w);
 
   DriWrapper* drm_;  // Not owned.
   ScreenManager* screen_manager_;  // Not owned.
   DriWindowManager* window_manager_;  // Not owned.
   HardwareState state_;
 
   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);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_