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

Commit 6f85a7a6 authored Jan 23, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jan 23, 2024

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

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

Change-Id: Ib0469206c3ca4be6643b163f804a8c614d3e65f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 8506d5c5 71652683

libs/hwui/RenderNode.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) {
	* stencil buffer may be needed. Views that use a functor to draw will be forced onto a layer.		* 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) {		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		// 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		// 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.		// 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	Original line	Diff line number	Diff line
	@@ -263,7 +263,7 @@ private:
	DisplayList mDisplayList;		DisplayList mDisplayList;
	DisplayList mStagingDisplayList;		DisplayList mStagingDisplayList;

	int64_t mDamageGenerationId;		int64_t mDamageGenerationId = 0;

	friend class AnimatorManager;		friend class AnimatorManager;
	AnimatorManager mAnimatorManager;		AnimatorManager mAnimatorManager;