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

Commit 87751a28 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Fix SkASSERT errors resulting from the order objects are allocated on the stack."

parents 144a6ae7 6b0437c2

core/jni/android/graphics/BitmapFactory.cpp

+14 −12
Original line number Diff line number Diff line
@@ -296,23 +296,11 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
    SkAutoTDelete<SkBitmap> adb(outputBitmap == NULL ? new SkBitmap : NULL);

    if (outputBitmap == NULL) outputBitmap = adb.get();



    SkAutoTDelete<SkImageDecoder> add(decoder);



    NinePatchPeeker peeker(decoder);

    decoder->setPeeker(&peeker);



    AutoDecoderCancel adc(options, decoder);



    // To fix the race condition in case "requestCancelDecode"

    // happens earlier than AutoDecoderCancel object is added

    // to the gAutoDecoderCancelMutex linked list.

    if (options != NULL && env->GetBooleanField(options, gOptions_mCancelID)) {

        return nullObjectReturn("gOptions_mCancelID");

    }



    SkImageDecoder::Mode decodeMode = isPurgeable ? SkImageDecoder::kDecodeBounds_Mode : mode;





    JavaPixelAllocator javaAllocator(env);

    RecyclingPixelAllocator recyclingAllocator(outputBitmap->pixelRef(), existingBufferSize);

    ScaleCheckingAllocator scaleCheckingAllocator(scale, existingBufferSize);
@@ -328,6 +316,20 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding, 
        }

    }



    // Only setup the decoder to be deleted after its stack-based, refcounted

    // components (allocators, peekers, etc) are declared. This prevents RefCnt

    // asserts from firing due to the order objects are deleted from the stack.

    SkAutoTDelete<SkImageDecoder> add(decoder);



    AutoDecoderCancel adc(options, decoder);



    // To fix the race condition in case "requestCancelDecode"

    // happens earlier than AutoDecoderCancel object is added

    // to the gAutoDecoderCancelMutex linked list.

    if (options != NULL && env->GetBooleanField(options, gOptions_mCancelID)) {

        return nullObjectReturn("gOptions_mCancelID");

    }



    SkBitmap decodingBitmap;

    if (!decoder->decode(stream, &decodingBitmap, prefConfig, decodeMode)) {

        return nullObjectReturn("decoder->decode returned false");