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

Commit 83123dd1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that mDamageGenerationId is a random value" into main... 

Merge "Fix the problem that mDamageGenerationId is a random value" into main am: 71652683 am: 6f85a7a6

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



Change-Id: I9eca6dd2e750edd96bcad080fe5838441f70c3aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 567f2472 6f85a7a6

libs/hwui/RenderNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { 
 * stencil buffer may be needed. Views that use a functor to draw will be forced onto a layer.

 */

void RenderNode::prepareTreeImpl(TreeObserver& observer, TreeInfo& info, bool functorsNeedLayer) {

    if (mDamageGenerationId == info.damageGenerationId) {

    if (mDamageGenerationId == info.damageGenerationId && mDamageGenerationId != 0) {

        // We hit the same node a second time in the same tree. We don't know the minimal

        // damage rect anymore, so just push the biggest we can onto our parent's transform

        // We push directly onto parent in case we are clipped to bounds but have moved position.

libs/hwui/RenderNode.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ private: 
    DisplayList mDisplayList;

    DisplayList mStagingDisplayList;



    int64_t mDamageGenerationId;

    int64_t mDamageGenerationId = 0;



    friend class AnimatorManager;

    AnimatorManager mAnimatorManager;