Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ffe727c authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Skip writing zeroes to java allocated memory. 

If pixel memory was just allocated by Java, tell our decoders not
to write 0s, since the memory was initialized to 0. Likewise,
when drawing to a bitmap with memory just allocated by Java, do
not erase to 0.

Depends on a change to external/skia to add the new option on
image decoders:
https://googleplex-android-review.git.corp.google.com/362663

BUG:10016979
Change-Id: I9a3dc969870f8516e7d8495fe96d0a6b8225eda2
parent 01fc0884

core/jni/android/graphics/BitmapFactory.cpp

+9 −1
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
            (SkBitmap::Allocator*)&recyclingAllocator : (SkBitmap::Allocator*)&javaAllocator;

    if (decodeMode != SkImageDecoder::kDecodeBounds_Mode) {

        if (!willScale) {

            // If the java allocator is being used to allocate the pixel memory, the decoder

            // need not write zeroes, since the memory is initialized to 0.

            decoder->setSkipWritingZeroes(outputAllocator == &javaAllocator);

            decoder->setAllocator(outputAllocator);

        } else if (javaBitmap != NULL) {

            // check for eventual scaled bounds at allocation time, so we don't decode the bitmap
@@ -403,7 +406,12 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
        if (!outputBitmap->allocPixels(outputAllocator, NULL)) {

            return nullObjectReturn("allocation failed for scaled bitmap");

        }



        // If outputBitmap's pixels are newly allocated by Java, there is no need

        // to erase to 0, since the pixels were initialized to 0.

        if (outputAllocator != &javaAllocator) {

            outputBitmap->eraseColor(0);

        }



        SkPaint paint;

        paint.setFilterBitmap(true);