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

Commit 037fc181 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu
Browse files

Recreate the bitmap cache when it is smaller than needed 

fix:32780212

Test: Existing CTS and attached repro apk.

Change-Id: Ib908319af6539b2438b850f7a50d5a539cef8368
parent 81769558

libs/hwui/VectorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ bool Tree::allocateBitmapIfNeeded(Cache& cache, int width, int height) { 
}



bool Tree::canReuseBitmap(Bitmap* bitmap, int width, int height) {

    return bitmap && width == bitmap->width() && height == bitmap->height();

    return bitmap && width <= bitmap->width() && height <= bitmap->height();

}



void Tree::onPropertyChanged(TreeProperties* prop) {

libs/hwui/VectorDrawable.h

+9 −4
Original line number Diff line number Diff line
@@ -630,10 +630,15 @@ public: 
        }



        void setScaledSize(int width, int height) {

            if (mNonAnimatableProperties.scaledWidth != width

                    || mNonAnimatableProperties.scaledHeight != height) {

                mNonAnimatableProperties.scaledWidth = width;

                mNonAnimatableProperties.scaledHeight = height;

            // If the requested size is bigger than what the bitmap was, then

            // we increase the bitmap size to match. The width and height

            // are bound by MAX_CACHED_BITMAP_SIZE.

            if (mNonAnimatableProperties.scaledWidth < width

                    || mNonAnimatableProperties.scaledHeight < height) {

                mNonAnimatableProperties.scaledWidth = std::max(width,

                        mNonAnimatableProperties.scaledWidth);

                mNonAnimatableProperties.scaledHeight = std::max(height,

                        mNonAnimatableProperties.scaledHeight);

                mNonAnimatablePropertiesDirty = true;

                mTree->onPropertyChanged(this);

            }