ozone: dri: Implement cursor animation

ui/ozone/platform/dri/dri_surface_factory.cc

 // 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.
 
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 
 #include <errno.h>
 
 #include "base/debug/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 37 matching lines @@
 // static
 const gfx::AcceleratedWidget DriSurfaceFactory::kDefaultWidgetHandle = 1;
 
 DriSurfaceFactory::DriSurfaceFactory(DriWrapper* drm,
                                      ScreenManager* screen_manager,
                                      DriWindowManager* window_manager)
     : drm_(drm),
       screen_manager_(screen_manager),
       window_manager_(window_manager),
       state_(UNINITIALIZED),
-      cursor_frontbuffer_(0) {
+      cursor_frontbuffer_(0),
+      cursor_widget_(0),
+      cursor_frame_(0),
+      cursor_frame_delay_ms_(0) {
 }
 
 DriSurfaceFactory::~DriSurfaceFactory() {
   if (state_ == INITIALIZED)
     ShutdownHardware();
 }
 
 DriSurfaceFactory::HardwareState DriSurfaceFactory::InitializeHardware() {
   if (state_ != UNINITIALIZED)
     return state_;
@@ skipping 20 matching lines @@
 }
 
 void DriSurfaceFactory::ShutdownHardware() {
   DCHECK(state_ == INITIALIZED);
   state_ = UNINITIALIZED;
 }
 
 scoped_ptr<ui::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   DCHECK(state_ == INITIALIZED);
-  // Initial cursor set.
-  ResetCursor(widget);
 
   return scoped_ptr<ui::SurfaceOzoneCanvas>(
       new DriSurface(window_manager_->GetWindowDelegate(widget), drm_));
 }
 
 bool DriSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 void DriSurfaceFactory::SetHardwareCursor(gfx::AcceleratedWidget widget,
                                           const std::vector<SkBitmap>& bitmaps,
                                           const gfx::Point& location,
                                           int frame_delay_ms) {
+  cursor_widget_ = widget;
   cursor_bitmaps_ = bitmaps;
   cursor_location_ = location;
+  cursor_frame_ = 0;
   cursor_frame_delay_ms_ = frame_delay_ms;
+  cursor_timer_.Stop();
 
-  if (bitmaps.size() > 1)
-    NOTIMPLEMENTED();  // No animation of animated cursors.
+  if (cursor_frame_delay_ms_)
+    cursor_timer_.Start(
+        FROM_HERE,
+        base::TimeDelta::FromMilliseconds(cursor_frame_delay_ms_),
+        this,
+        &DriSurfaceFactory::OnCursorAnimationTimeout);
 
   if (state_ != INITIALIZED)
     return;
 
-  ResetCursor(widget);
+  ResetCursor();
 }
 
 void DriSurfaceFactory::MoveHardwareCursor(gfx::AcceleratedWidget widget,
                                            const gfx::Point& location) {
   cursor_location_ = location;
 
   if (state_ != INITIALIZED)
     return;
 
   HardwareDisplayController* controller =
       window_manager_->GetWindowDelegate(widget)->GetController();
   if (controller)
     controller->MoveCursor(location);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DriSurfaceFactory private
 
-void DriSurfaceFactory::ResetCursor(gfx::AcceleratedWidget widget) {
+void DriSurfaceFactory::ResetCursor() {
+  if (!cursor_widget_)
+    return;
+
   HardwareDisplayController* controller =
-      window_manager_->GetWindowDelegate(widget)->GetController();
+      window_manager_->GetWindowDelegate(cursor_widget_)->GetController();
 
   if (cursor_bitmaps_.size()) {
     // Draw new cursor into backbuffer.
     UpdateCursorImage(cursor_buffers_[cursor_frontbuffer_ ^ 1].get(),
-                      cursor_bitmaps_[0]);
+                      cursor_bitmaps_[cursor_frame_]);
 
     // Reset location & buffer.
     if (controller) {

[dnicoara, 2014/09/08 13:53:18]

nit: Is it possible to move this if-statement and the one in line 173 up one
level?

[spang, 2014/09/08 15:15:49]

Done.

[spang, 2014/09/10 15:22:12]

And undone.. your test relies on the previous behavior.

       controller->MoveCursor(cursor_location_);
       controller->SetCursor(cursor_buffers_[cursor_frontbuffer_ ^ 1]);
       cursor_frontbuffer_ ^= 1;
     }
   } else {
     // No cursor set.
     if (controller)
       controller->UnsetCursor();
   }
 }
 
+void DriSurfaceFactory::OnCursorAnimationTimeout() {
+  cursor_frame_++;
+  cursor_frame_ %= cursor_bitmaps_.size();
+
+  ResetCursor();
+}
+
 }  // namespace ui