Use SkBitmapOperations to extract a frame of animation cursors.

r201206 caused a regression. It broke animation cursors, because SkBitmap.extractSubset() doesn't extract a frame of animation cursor image. This patch fixes the regression, using SkBitmapOperations::CreateTiledBitmap to extract a frame of animation image instead of SkBitmap.extractSubset().

BUG=126942
TEST=The wait cursor animates correctly.

Review URL: https://chromiumcodereview.appspot.com/15896012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202825 0039d316-1c4b-4281-b951-d872f2087c98

ui/base/cursor/cursor_loader_x11.cc

@@ -232,16 +232,13 @@ void CursorLoaderX11::LoadAnimatedCursor(int id,
     int x_offset = frame_width * frame;
     DCHECK_LE(x_offset + frame_width, total_width);
 
-    SkBitmap cropped;
-    SkIRect rect = SkIRect::MakeXYWH(x_offset, 0, frame_width, frame_height);
-    bitmap.extractSubset(&cropped, rect);
+    SkBitmap cropped = SkBitmapOperations::CreateTiledBitmap(
+        bitmap, x_offset, 0, frame_width, frame_height);
     DCHECK_EQ(frame_width, cropped.width());
     DCHECK_EQ(frame_height, cropped.height());
 
-    if (scale() != 1.f)
-      ScaleCursorImageAndHotpoint(scale(), &cropped, &hotpoint);
-
     XcursorImage* x_image = SkBitmapToXcursorImage(&cropped, hotpoint);
+
     x_image->delay = frame_delay_ms;
     x_images->images[frame] = x_image;
   }