commit beff8d83ef062975459f149ad0c632a3797d78ce
author Romain Guy <romainguy@google.com> Tue Feb 01 23:53:34 2011 -0800
committer Romain Guy <romainguy@google.com> Tue Feb 01 23:53:34 2011 -0800
tree c385cc6dc79a61c2e68cf9c72464ca038142caae
parent 3a3133d876caf60ebff2176ad75c3dcf0259148d

Fix incorrect dirty rectangle transformation in hardware layers.
Bug #3413433

Change-Id: Iba201c7c4b4f11937797f3afcbf20c5a7395be25

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 5d5a09a4..09e1d89 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3537,6 +3537,12 @@
                 // Make sure we do not set both flags at the same time
                 int opaqueFlag = isOpaque ? DIRTY_OPAQUE : DIRTY;
 
+                if (child.mLayerType != LAYER_TYPE_NONE) {
+                    mPrivateFlags |= INVALIDATED;
+                    mPrivateFlags &= ~DRAWING_CACHE_VALID;
+                    child.mLocalDirtyRect.union(dirty);
+                }
+
                 final int[] location = attachInfo.mInvalidateChildLocation;
                 location[CHILD_LEFT_INDEX] = child.mLeft;
                 location[CHILD_TOP_INDEX] = child.mTop;
@@ -3550,12 +3556,6 @@
                             (int) (boundingRect.bottom + 0.5f));
                 }
 
-                if (child.mLayerType != LAYER_TYPE_NONE) {
-                    mPrivateFlags |= INVALIDATED;
-                    mPrivateFlags &= ~DRAWING_CACHE_VALID;
-                    child.mLocalDirtyRect.union(dirty);
-                }
-
                 do {
                     View view = null;
                     if (parent instanceof View) {
@@ -3639,7 +3639,7 @@
                     if (mLayerType != LAYER_TYPE_NONE) {
                         mLocalDirtyRect.union(dirty);
                     }
-                    
+
                     return mParent;
                 }
             } else {

libs/hwui/LayerRenderer.cpp

diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index aebd2b7..7379b63 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -39,6 +39,7 @@
         mLayer->region.clear();
         dirty.set(0.0f, 0.0f, mLayer->width, mLayer->height);
     } else {
+        dirty.intersect(0.0f, 0.0f, mLayer->width, mLayer->height);
         android::Rect r(dirty.left, dirty.top, dirty.right, dirty.bottom);
         mLayer->region.subtractSelf(r);
     }