commit d22140d8aa241f5cd72ec82b9d642b484fcf8182
author Linux Build Service Account <lnxbuild@localhost> Sun Feb 01 14:29:32 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Feb 01 14:29:32 2015 -0800
tree a858c92a64749af9000c2daf612f83bfdd7dd663
parent 2aca8662cf25c2b14e8ee7adf812fbe645f7f1b7
parent 24255e1b84cebf5d136cbebddbc10544247c8354

Merge "libgui: Copyback all region except dirty region for newly allocated buffer"

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 5360e0d..7859609 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -877,9 +877,13 @@
         if (canCopyBack) {
             Mutex::Autolock lock(mMutex);
             Region oldDirtyRegion;
-            for(int i = 0 ; i < NUM_BUFFER_SLOTS; i++ ) {
-                if(i != backBufferSlot && !mSlots[i].dirtyRegion.isEmpty())
-                    oldDirtyRegion.orSelf(mSlots[i].dirtyRegion);
+            if(mSlots[backBufferSlot].dirtyRegion.isEmpty()) {
+                oldDirtyRegion.set(bounds);
+            } else {
+                for(int i = 0 ; i < NUM_BUFFER_SLOTS; i++ ) {
+                    if(i != backBufferSlot && !mSlots[i].dirtyRegion.isEmpty())
+                        oldDirtyRegion.orSelf(mSlots[i].dirtyRegion);
+                }
             }
             const Region copyback(oldDirtyRegion.subtract(newDirtyRegion));
             if (!copyback.isEmpty())