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

Commit afb22390 authored by Mike Reed's avatar Mike Reed Committed by Android (Google) Code Review
Browse files

Merge "switch to unique_ptr version of Skia stream api"

parents 52c0e916 be896edb

core/jni/android/graphics/BitmapFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static jobject nativeDecodeStream(JNIEnv* env, jobject clazz, jobject is, jbyteA 


    if (stream.get()) {

        std::unique_ptr<SkStreamRewindable> bufferedStream(

                SkFrontBufferedStream::Create(stream.release(), SkCodec::MinBufferedBytesNeeded()));

                SkFrontBufferedStream::Make(std::move(stream), SkCodec::MinBufferedBytesNeeded()));

        SkASSERT(bufferedStream.get() != NULL);

        bitmap = doDecode(env, std::move(bufferedStream), padding, options);

    }
@@ -610,7 +610,7 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi 
    // Use a buffered stream. Although an SkFILEStream can be rewound, this

    // ensures that SkImageDecoder::Factory never rewinds beyond the

    // current position of the file descriptor.

    std::unique_ptr<SkStreamRewindable> stream(SkFrontBufferedStream::Create(fileStream.release(),

    std::unique_ptr<SkStreamRewindable> stream(SkFrontBufferedStream::Make(std::move(fileStream),

            SkCodec::MinBufferedBytesNeeded()));



    return doDecode(env, std::move(stream), padding, bitmapFactoryOptions);

core/jni/android/graphics/Movie.cpp

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ static jobject movie_decodeStream(JNIEnv* env, jobject clazz, jobject istream) { 
    // will only read 6.

    // FIXME: Get this number from SkImageDecoder

    // bufferedStream takes ownership of strm

    std::unique_ptr<SkStreamRewindable> bufferedStream(SkFrontBufferedStream::Create(strm, 6));

    std::unique_ptr<SkStreamRewindable> bufferedStream(SkFrontBufferedStream::Make(

        std::unique_ptr<SkStream>(strm), 6));

    SkASSERT(bufferedStream.get() != NULL);



    Movie* moov = Movie::DecodeStream(bufferedStream.get());

core/jni/android/graphics/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ bool AssetStreamAdaptor::isAtEnd() const { 
    return fAsset->getRemainingLength() == 0;

}



SkStreamRewindable* AssetStreamAdaptor::duplicate() const {

SkStreamRewindable* AssetStreamAdaptor::onDuplicate() const {

    // Cannot create a duplicate, since each AssetStreamAdaptor

    // would be modifying the Asset.

    //return new AssetStreamAdaptor(fAsset);

core/jni/android/graphics/Utils.h

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ public: 
    virtual size_t getLength() const;

    virtual bool isAtEnd() const;



    virtual SkStreamRewindable* duplicate() const;

protected:

    SkStreamRewindable* onDuplicate() const override;



private:

    Asset* fAsset;

};