From cc11f15f76a62ded3e403cb2bc818c6aa5bf261c Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Mon, 31 Mar 2014 16:52:13 -0400 Subject: Update to call new Skia APIs. I816129d49c0118453222916f3c818eccac33663d merges a new version of Skia that updates various APIs. Call the new ones. SkBitmap::copyTo now takes an SkColorType instead of an SkBitmap::Config, so do the conversion with SkBitmapConfigToColorType or use the enum when it makes sense. Call SkImageDecoder::decodeSubset instead of (deprecated) SkImageDecoder::decodeRegion. Override SkCanvas::ClipVisitor::clipRRect in ClipCopier. In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was previously called inside the clip call, to determine the return value. For various SkPaint effects, call the new factories (as the constructors have been made protected). Implement SkJavaOutputStream::bytesWritten(), overriding a new pure virtual function on SkWStream. Update Matrix calls to always return true (since SkMatrix calls no longer return a value). Depends on I816129d49c0118453222916f3c818eccac33663d (skia). Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002 --- libs/input/SpriteController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/input/SpriteController.h') diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h index 75e4843d38dc..797efd747066 100644 --- a/libs/input/SpriteController.h +++ b/libs/input/SpriteController.h @@ -65,7 +65,7 @@ struct SpriteIcon { inline SpriteIcon copy() const { SkBitmap bitmapCopy; - bitmap.copyTo(&bitmapCopy, SkBitmap::kARGB_8888_Config); + bitmap.copyTo(&bitmapCopy, kNative_8888_SkColorType); return SpriteIcon(bitmapCopy, hotSpotX, hotSpotY); } -- cgit v1.2.3-59-g8ed1b