ozone: Plumb animated cursors from CursorLoaderOzone to CursorFactoryOzone

ui/base/cursor/cursor_loader_ozone.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/base/cursor/cursor_loader_ozone.h"
 
+#include <vector>
+
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/skbitmap_operations.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 
 namespace ui {
 
 CursorLoaderOzone::CursorLoaderOzone() {}
 
 CursorLoaderOzone::~CursorLoaderOzone() {}
 
 void CursorLoaderOzone::LoadImageCursor(int id,
                                         int resource_id,
                                         const gfx::Point& hot) {
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   const gfx::ImageSkiaRep& image_rep =
       image->GetRepresentation(scale());
   SkBitmap bitmap = image_rep.sk_bitmap();
   cursors_[id] =
       CursorFactoryOzone::GetInstance()->CreateImageCursor(bitmap, hot);
 }
 
 void CursorLoaderOzone::LoadAnimatedCursor(int id,
                                            int resource_id,
                                            const gfx::Point& hot,
                                            int frame_delay_ms) {
-  // TODO(dnicoara) Add support: crbug.com/343245
-  NOTIMPLEMENTED();
+  const gfx::ImageSkia* image =
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
+  const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale());
+  SkBitmap bitmap = image_rep.sk_bitmap();
+  int frame_width = bitmap.height();
+  int frame_height = frame_width;
+  int total_width = bitmap.width();
+  DCHECK_EQ(total_width % frame_width, 0);
+  int frame_count = total_width / frame_width;
+  DCHECK_GT(frame_count, 0);
+
+  std::vector<SkBitmap> bitmaps(frame_count);
+
+  for (int frame = 0; frame < frame_count; ++frame) {
+    int x_offset = frame_width * frame;
+    DCHECK_LE(x_offset + frame_width, total_width);
+
+    SkBitmap cropped = SkBitmapOperations::CreateTiledBitmap(

[sky, 2014/09/04 21:23:12]

Please refactor this as it looks to be exactly the same as
CursorLoaderX11::LoadAnimatedCursor .

[spang, 2014/09/05 16:26:26]

Done.

+        bitmap, x_offset, 0, frame_width, frame_height);
+    DCHECK_EQ(frame_width, cropped.width());
+    DCHECK_EQ(frame_height, cropped.height());
+
+    bitmaps[frame] = cropped;
+  }
+
+  cursors_[id] = CursorFactoryOzone::GetInstance()->CreateAnimatedCursor(
+      bitmaps, hot, frame_delay_ms);
 }
 
 void CursorLoaderOzone::UnloadAll() {
   for (ImageCursorMap::const_iterator it = cursors_.begin();
        it != cursors_.end();
        ++it)
     CursorFactoryOzone::GetInstance()->UnrefImageCursor(it->second);
   cursors_.clear();
 }
 
@@ skipping 13 matching lines @@
   }
 
   cursor->SetPlatformCursor(platform);
 }
 
 CursorLoader* CursorLoader::Create() {
   return new CursorLoaderOzone();
 }
 
 }  // namespace ui