diff options
author | Leon Scroggins <scroggo@google.com> | 2014-03-31 16:52:13 -0400 |
---|---|---|
committer | Leon Scroggins III <scroggo@google.com> | 2014-04-04 14:42:39 -0400 |
commit | cc11f15f76a62ded3e403cb2bc818c6aa5bf261c (patch) | |
tree | 1df94766a0343820a8b542d3a79705a33d9fcf59 /libs/input | |
parent | 35dec44394358bac2cdf31d5e8377687a1723476 (diff) | |
download | frameworks_base-cc11f15f76a62ded3e403cb2bc818c6aa5bf261c.zip frameworks_base-cc11f15f76a62ded3e403cb2bc818c6aa5bf261c.tar.gz frameworks_base-cc11f15f76a62ded3e403cb2bc818c6aa5bf261c.tar.bz2 |
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
Diffstat (limited to 'libs/input')
-rw-r--r-- | libs/input/SpriteController.cpp | 2 | ||||
-rw-r--r-- | libs/input/SpriteController.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 2667a72..3f6ccc9 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -402,7 +402,7 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { uint32_t dirty; if (icon.isValid()) { - icon.bitmap.copyTo(&mLocked.state.icon.bitmap, SkBitmap::kARGB_8888_Config); + icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kNative_8888_SkColorType); if (!mLocked.state.icon.isValid() || mLocked.state.icon.hotSpotX != icon.hotSpotX diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h index 75e4843..797efd7 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); } |