From 155d52155b67d1563d0a55f654683d98832d0860 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Tue, 25 Apr 2017 17:32:34 -0400 Subject: Remove uses of SkBitmap::copyTo This API is being deleted: skbug.com/6464 Test: Refactor Change-Id: Id78653ca45d6bfee2e4f9c9c24c2414b888f0df5 --- libs/input/SpriteController.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/input/SpriteController.cpp') diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 8613a3b07bb5..ed31b1202863 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -405,7 +405,11 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { 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 -- cgit v1.2.3-59-g8ed1b