commit 155d52155b67d1563d0a55f654683d98832d0860
author Matt Sarett <msarett@google.com> Tue Apr 25 17:32:34 2017 -0400
committer Matt Sarett <msarett@google.com> Wed Apr 26 16:17:46 2017 -0400
tree a8a312d22ca34244a27523aced9393c74ef764dc
parent c2d407a7dc4ea0f402037cac548b47e95bf426a1

Remove uses of SkBitmap::copyTo

This API is being deleted:
skbug.com/6464

Test: Refactor

Change-Id: Id78653ca45d6bfee2e4f9c9c24c2414b888f0df5

libs/input/SpriteController.cpp

diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp
index 8613a3b..ed31b12 100644
--- a/libs/input/SpriteController.cpp
+++ b/libs/input/SpriteController.cpp
@@ -405,7 +405,11 @@
 
     uint32_t dirty;
     if (icon.isValid()) {
-        icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kN32_SkColorType);
+        SkBitmap* bitmapCopy = &mLocked.state.icon.bitmap;
+        if (bitmapCopy->tryAllocPixels(icon.bitmap.info().makeColorType(kN32_SkColorType))) {
+            icon.bitmap.readPixels(bitmapCopy->info(), bitmapCopy->getPixels(),
+                    bitmapCopy->rowBytes(), 0, 0);
+        }
 
         if (!mLocked.state.icon.isValid()
                 || mLocked.state.icon.hotSpotX != icon.hotSpotX

libs/input/SpriteController.h

diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 7fc8d6f..31e43e9 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -65,7 +65,10 @@
 
     inline SpriteIcon copy() const {
         SkBitmap bitmapCopy;
-        bitmap.copyTo(&bitmapCopy, kN32_SkColorType);
+        if (bitmapCopy.tryAllocPixels(bitmap.info().makeColorType(kN32_SkColorType))) {
+            bitmap.readPixels(bitmapCopy.info(), bitmapCopy.getPixels(), bitmapCopy.rowBytes(),
+                    0, 0);
+        }
         return SpriteIcon(bitmapCopy, hotSpotX, hotSpotY);
     }