commit bbde69153e9190a86d4fbc580a424436562d09fb
author Steven Thomas <steventhomas@google.com> Fri Jul 12 13:29:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 13:29:42 2019 -0700
tree bce886322dd8b6eafe4d0c398df38b9195ec2d14
parent 2212645bd869a903210f0b52b0d8acb23a5cb860
parent 84a792e03448047242fdc606af3160a113f80525

Merge "When dropping a frame, merge its damage region" into qt-r1-dev am: fcc3962a64
am: 84a792e034

Change-Id: Icb10b8e53a113796ed8eccb7d3a61a473643bc96

libs/gui/BufferQueueProducer.cpp

diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index da091cc..d149674 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -940,6 +940,15 @@
                     }
                 }
 
+                // Make sure to merge the damage rect from the frame we're about
+                // to drop into the new frame's damage rect.
+                if (last.mSurfaceDamage.bounds() == Rect::INVALID_RECT ||
+                    item.mSurfaceDamage.bounds() == Rect::INVALID_RECT) {
+                    item.mSurfaceDamage = Region::INVALID_REGION;
+                } else {
+                    item.mSurfaceDamage |= last.mSurfaceDamage;
+                }
+
                 // Overwrite the droppable buffer with the incoming one
                 mCore->mQueue.editItemAt(mCore->mQueue.size() - 1) = item;
                 frameReplacedListener = mCore->mConsumerListener;