ozone: Plumb animated cursors from BitmapCursorFactoryOzone to DriSurfaceFactory

ui/ozone/platform/dri/dri_cursor.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_cursor.h"
 
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
@@ skipping 14 matching lines @@
 
 void DriCursor::SetCursor(gfx::AcceleratedWidget widget,
                           PlatformCursor platform_cursor) {
   scoped_refptr<BitmapCursorOzone> cursor =
       BitmapCursorFactoryOzone::GetBitmapCursor(platform_cursor);
   if (cursor_ == cursor)
     return;
 
   cursor_ = cursor;
   if (cursor_)
-    hardware_->SetHardwareCursor(
-        cursor_window_, cursor_->bitmap(), bitmap_location());
+    hardware_->SetHardwareCursor(cursor_window_,
+                                 cursor_->bitmaps(),
+                                 bitmap_location(),
+                                 cursor_->frame_delay_ms());
   else
-    hardware_->SetHardwareCursor(cursor_window_, SkBitmap(), gfx::Point());
+    UnsetCursor(cursor_window_);
 }
 
 void DriCursor::MoveCursorTo(gfx::AcceleratedWidget widget,
                              const gfx::PointF& location) {
   if (widget != cursor_window_)
-    hardware_->SetHardwareCursor(cursor_window_, SkBitmap(), gfx::Point());
+    UnsetCursor(cursor_window_);
 
   cursor_window_ = widget;
   cursor_location_ = location;
 
   gfx::Size size = gfx::Size(2560, 1700);  // TODO(spang): Fix.
   cursor_location_.SetToMax(gfx::PointF(0, 0));
   cursor_location_.SetToMin(gfx::PointF(size.width(), size.height()));
 
   if (cursor_)
     hardware_->MoveHardwareCursor(cursor_window_, bitmap_location());
@@ skipping 13 matching lines @@
 
 gfx::PointF DriCursor::location() {
   return cursor_location_;
 }
 
 gfx::Point DriCursor::bitmap_location() {
   return gfx::ToFlooredPoint(cursor_location_) -
          cursor_->hotspot().OffsetFromOrigin();
 }
 
+void DriCursor::UnsetCursor(gfx::AcceleratedWidget widget) {
+  hardware_->SetHardwareCursor(
+      widget, std::vector<SkBitmap>(), gfx::Point(), 0);
+}
+
 }  // namespace ui