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

Commit 77728db1 authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Merge "Improve snapshot clearing consistency" into sc-dev am: 2b9301d0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018151

Change-Id: I1ccb6818b5fed4bba2c3e1cc0aff7808d1b5b537
parents 286de121 2b9301d0

libs/hwui/RenderNode.cpp

+1 −2
Original line number Diff line number Diff line
@@ -455,8 +455,7 @@ void RenderNode::destroyLayers() { 
    if (hasLayer()) {

        this->setLayerSurface(nullptr);

    }

    mSnapshotResult.snapshot = nullptr;

    mTargetImageFilter = nullptr;



    if (mDisplayList) {

        mDisplayList.updateChildren([](RenderNode* child) { child->destroyLayers(); });

    }

libs/hwui/RenderNode.h

+5 −0
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ public: 
        } else {

            mSkiaLayer.reset();

        }



        // Clear out the previous snapshot and the image filter the previous

        // snapshot was created with whenever the layer changes.

        mSnapshotResult.snapshot = nullptr;

        mTargetImageFilter = nullptr;

    }



    /**