diff options
| author | John Reck <jreck@google.com> | 2015-05-04 14:34:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-04 14:34:52 +0000 |
| commit | 05dc201ff64f6324c2726a8841af7021e7071b97 (patch) | |
| tree | e3d4dcbeb60a01cf2f4cf7f255ef4fa3ad11c05a /core/java/android/view | |
| parent | 1641c0cb0b6baf313c82846fe4f64007078c604f (diff) | |
| parent | 7c103a36f60b690e3fe83c40210e1cb0c76bba43 (diff) | |
| download | frameworks_base-05dc201ff64f6324c2726a8841af7021e7071b97.zip frameworks_base-05dc201ff64f6324c2726a8841af7021e7071b97.tar.gz frameworks_base-05dc201ff64f6324c2726a8841af7021e7071b97.tar.bz2 | |
Merge "Remove Bitmap#getSkBitmap" into mnc-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/DisplayListCanvas.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/DisplayListCanvas.java b/core/java/android/view/DisplayListCanvas.java index 46dd857..48167c8 100644 --- a/core/java/android/view/DisplayListCanvas.java +++ b/core/java/android/view/DisplayListCanvas.java @@ -271,7 +271,7 @@ public class DisplayListCanvas extends Canvas { Bitmap bitmap = patch.getBitmap(); throwIfCannotDraw(bitmap); final long nativePaint = paint == null ? 0 : paint.getNativeInstance(); - nDrawPatch(mNativeCanvasWrapper, bitmap.getSkBitmap(), patch.mNativeChunk, + nDrawPatch(mNativeCanvasWrapper, bitmap, patch.mNativeChunk, dst.left, dst.top, dst.right, dst.bottom, nativePaint); } @@ -281,11 +281,11 @@ public class DisplayListCanvas extends Canvas { Bitmap bitmap = patch.getBitmap(); throwIfCannotDraw(bitmap); final long nativePaint = paint == null ? 0 : paint.getNativeInstance(); - nDrawPatch(mNativeCanvasWrapper, bitmap.getSkBitmap(), patch.mNativeChunk, + nDrawPatch(mNativeCanvasWrapper, bitmap, patch.mNativeChunk, dst.left, dst.top, dst.right, dst.bottom, nativePaint); } - private static native void nDrawPatch(long renderer, long bitmap, long chunk, + private static native void nDrawPatch(long renderer, Bitmap bitmap, long chunk, float left, float top, float right, float bottom, long paint); public void drawCircle(CanvasProperty<Float> cx, CanvasProperty<Float> cy, |