diff options
| author | John Reck <jreck@google.com> | 2015-04-16 14:29:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 14:29:21 +0000 |
| commit | 8560630596f8273356fddc4ee0c8ff6bfae640b8 (patch) | |
| tree | 41b3ed1ac8f207e1f5042f9b81ff35d714694c5e /core/java | |
| parent | 64e605a5be1468be8530ad269c9c56153622c9c5 (diff) | |
| parent | 4bd981ec533a65e8dee053a0a709b484770b0a76 (diff) | |
| download | frameworks_base-8560630596f8273356fddc4ee0c8ff6bfae640b8.zip frameworks_base-8560630596f8273356fddc4ee0c8ff6bfae640b8.tar.gz frameworks_base-8560630596f8273356fddc4ee0c8ff6bfae640b8.tar.bz2 | |
Merge "Remove Bitmap#getSkBitmap"
Diffstat (limited to 'core/java')
| -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 ec8f802..e9f2353 100644 --- a/core/java/android/view/DisplayListCanvas.java +++ b/core/java/android/view/DisplayListCanvas.java @@ -283,7 +283,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); } @@ -293,11 +293,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, |