commit c36bd6c16ddfc160732ff7e4518564714c8aa66e
author sergeyv <sergeyv@google.com> Tue Oct 11 15:49:16 2016 -0700
committer sergeyv <sergeyv@google.com> Thu Oct 13 18:22:04 2016 -0700
tree 0e092d8c0ce53c3b9d2fbfa7bd4890166fcff63f
parent 01421d760aa1fe9dc370a4d0f2ef662f39d2baed

Move allocatePixelRef methods to hwui.
This patch also makes tests to use SkBitmap backed by hwui/PixelRef,
Test: refactoring cl.
bug:27762775

Change-Id: Ib936e81877790849118420f5e565fc8f4466c1be

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 9ed1588..6e3fbf7 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -548,7 +548,7 @@
     bitmap.setInfo(SkImageInfo::Make(width, height, colorType, kPremul_SkAlphaType,
             GraphicsJNI::defaultColorSpace()));
 
-    PixelRef* nativeBitmap = GraphicsJNI::allocateHeapPixelRef(&bitmap, NULL);
+    sk_sp<PixelRef> nativeBitmap = PixelRef::allocateHeapPixelRef(&bitmap, NULL);
     if (!nativeBitmap) {
         return NULL;
     }
@@ -558,8 +558,7 @@
                 0, 0, width, height, bitmap);
     }
 
-    return createBitmap(env, nativeBitmap,
-            getPremulBitmapCreateFlags(isMutable));
+    return createBitmap(env, nativeBitmap.release(), getPremulBitmapCreateFlags(isMutable));
 }
 
 static jobject Bitmap_copy(JNIEnv* env, jobject, jlong srcHandle,
@@ -832,7 +831,7 @@
     }
 
     // Map the bitmap in place from the ashmem region if possible otherwise copy.
-    PixelRef* nativeBitmap;
+    sk_sp<PixelRef> nativeBitmap;
     if (blob.fd() >= 0 && (blob.isMutable() || !isMutable) && (size >= ASHMEM_BITMAP_MIN_SIZE)) {
 #if DEBUG_PARCEL
         ALOGD("Bitmap.createFromParcel: mapped contents of %s bitmap from %s blob "
@@ -853,8 +852,8 @@
         }
 
         // Map the pixels in place and take ownership of the ashmem region.
-        nativeBitmap = GraphicsJNI::mapAshmemPixelRef(env, bitmap.get(),
-                ctable, dupFd, const_cast<void*>(blob.data()), size, !isMutable);
+        nativeBitmap = sk_sp<PixelRef>(GraphicsJNI::mapAshmemPixelRef(env, bitmap.get(),
+                ctable, dupFd, const_cast<void*>(blob.data()), size, !isMutable));
         SkSafeUnref(ctable);
         if (!nativeBitmap) {
             close(dupFd);
@@ -880,7 +879,7 @@
 #endif
 
         // Copy the pixels into a new buffer.
-        nativeBitmap = GraphicsJNI::allocateHeapPixelRef(bitmap.get(), ctable);
+        nativeBitmap = PixelRef::allocateHeapPixelRef(bitmap.get(), ctable);
         SkSafeUnref(ctable);
         if (!nativeBitmap) {
             blob.release();
@@ -895,7 +894,7 @@
         blob.release();
     }
 
-    return createBitmap(env, nativeBitmap,
+    return createBitmap(env, nativeBitmap.release(),
             getPremulBitmapCreateFlags(isMutable), NULL, NULL, density);
 }