diff options
| author | John Reck <jreck@google.com> | 2015-04-17 20:45:19 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-04-17 20:46:47 +0000 |
| commit | 7809f835cae637c12eebdc92103ad88890228d97 (patch) | |
| tree | 6e1d18e8b417f76e32a13b22ac9c3ced00b8c083 /core/jni | |
| parent | afbeb2c2374bf7b7f7efa120944714fab469173d (diff) | |
| download | frameworks_base-7809f835cae637c12eebdc92103ad88890228d97.zip frameworks_base-7809f835cae637c12eebdc92103ad88890228d97.tar.gz frameworks_base-7809f835cae637c12eebdc92103ad88890228d97.tar.bz2 | |
Revert "Move AssetAtlas off of SkBitmap*"
This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.
Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
Diffstat (limited to 'core/jni')
| -rwxr-xr-x | core/jni/android/graphics/Bitmap.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 5c95f8a..7a934bd 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -857,13 +857,6 @@ static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapHandle) { bitmap->unlockPixels(); } -static jlong Bitmap_refPixelRef(JNIEnv* env, jobject, jlong bitmapHandle) { - SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle); - SkPixelRef* pixelRef = bitmap ? bitmap->pixelRef() : nullptr; - SkSafeRef(pixelRef); - return reinterpret_cast<jlong>(pixelRef); -} - /////////////////////////////////////////////////////////////////////////////// static JNINativeMethod gBitmapMethods[] = { @@ -903,7 +896,6 @@ static JNINativeMethod gBitmapMethods[] = { (void*)Bitmap_copyPixelsFromBuffer }, { "nativeSameAs", "(JJ)Z", (void*)Bitmap_sameAs }, { "nativePrepareToDraw", "(J)V", (void*)Bitmap_prepareToDraw }, - { "nativeRefPixelRef", "(J)J", (void*)Bitmap_refPixelRef }, }; int register_android_graphics_Bitmap(JNIEnv* env) |