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

Commit 4eec25af authored by Ben Wagner's avatar Ben Wagner Committed by Android (Google) Code Review
Browse files

Merge "Remove dead code from AssetStreamAdapter."

parents 49accefb c2d39573

core/jni/android/graphics/BitmapFactory.cpp

+1 −2
Original line number Diff line number Diff line
@@ -523,8 +523,7 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jlong native_asset, 
    Asset* asset = reinterpret_cast<Asset*>(native_asset);

    // since we know we'll be done with the asset when we return, we can

    // just use a simple wrapper

    SkAutoTUnref<SkStreamRewindable> stream(new AssetStreamAdaptor(asset,

            AssetStreamAdaptor::kNo_OwnAsset, AssetStreamAdaptor::kNo_HasMemoryBase));

    SkAutoTUnref<SkStreamRewindable> stream(new AssetStreamAdaptor(asset));

    return doDecode(env, stream, padding, options);

}

core/jni/android/graphics/Movie.cpp

+1 −3
Original line number Diff line number Diff line
@@ -84,9 +84,7 @@ static void movie_draw(JNIEnv* env, jobject movie, jlong canvasHandle, 
static jobject movie_decodeAsset(JNIEnv* env, jobject clazz, jlong native_asset) {

    android::Asset* asset = reinterpret_cast<android::Asset*>(native_asset);

    if (asset == NULL) return NULL;

    SkAutoTUnref<SkStreamRewindable> stream (new android::AssetStreamAdaptor(asset,

            android::AssetStreamAdaptor::kNo_OwnAsset,

            android::AssetStreamAdaptor::kNo_HasMemoryBase));

    SkAutoTUnref<SkStreamRewindable> stream(new android::AssetStreamAdaptor(asset));

    SkMovie* moov = SkMovie::DecodeStream(stream.get());

    return create_jmovie(env, moov);

}

core/jni/android/graphics/Utils.cpp

+1 −11
Original line number Diff line number Diff line
@@ -19,21 +19,11 @@ 


using namespace android;



AssetStreamAdaptor::AssetStreamAdaptor(Asset* asset, OwnAsset ownAsset,

                                       HasMemoryBase hasMemoryBase)

AssetStreamAdaptor::AssetStreamAdaptor(Asset* asset)

    : fAsset(asset)

    , fMemoryBase(kYes_HasMemoryBase == hasMemoryBase ?

                  asset->getBuffer(false) : NULL)

    , fOwnAsset(ownAsset)

{

}



AssetStreamAdaptor::~AssetStreamAdaptor() {

    if (kYes_OwnAsset == fOwnAsset) {

        delete fAsset;

    }

}



bool AssetStreamAdaptor::rewind() {

    off64_t pos = fAsset->seek(0, SEEK_SET);

    if (pos == (off64_t)-1) {

core/jni/android/graphics/Utils.h

+2 −21
Original line number Diff line number Diff line
@@ -28,22 +28,7 @@ namespace android { 


class AssetStreamAdaptor : public SkStreamRewindable {

public:

    // Enum passed to constructor. If set to kYes_OwnAsset,

    // the passed in Asset will be deleted upon destruction.

    enum OwnAsset {

        kYes_OwnAsset,

        kNo_OwnAsset,

    };



    // Enum passed to constructor. If set to kYes_HasMemoryBase,

    // getMemoryBase will return the Asset's buffer.

    enum HasMemoryBase {

        kYes_HasMemoryBase,

        kNo_HasMemoryBase,

    };



    AssetStreamAdaptor(Asset*, OwnAsset, HasMemoryBase);

    ~AssetStreamAdaptor();

    AssetStreamAdaptor(Asset*);



    virtual bool rewind();

    virtual size_t read(void* buffer, size_t size);
@@ -51,13 +36,9 @@ public: 
    virtual size_t getLength() const;

    virtual bool isAtEnd() const;



    virtual const void* getMemoryBase() { return fMemoryBase; }



    virtual SkStreamRewindable* duplicate() const;

private:

    Asset* fAsset;

    const void* const   fMemoryBase;

    const OwnAsset      fOwnAsset;

};



/**