commit c71bfcaa182e3d4fd9874362d3b4781fda934a21
author Chris Craik <ccraik@google.com> Thu Aug 21 10:18:58 2014 -0700
committer Chris Craik <ccraik@google.com> Thu Aug 21 10:18:59 2014 -0700
tree cbb11e94b0a849bb86b13206d9a4693d33b61890
parent 3acf66f5580b9e411ff20674c676de0901d4b459

Fix layer shadow transform crash

bug:17180252

Change-Id: Ia648b8c98a217a3a4973917bf255d1397802cbbe

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 0db6198..dca7520 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -179,13 +179,6 @@
         transformUpdateNeeded = true;
     }
 
-    if (transformUpdateNeeded) {
-        // update the transform in window of the layer to reset its origin wrt light source position
-        Matrix4 windowTransform;
-        info.damageAccumulator->computeCurrentTransform(&windowTransform);
-        mLayer->setWindowTransform(windowTransform);
-    }
-
     SkRect dirty;
     info.damageAccumulator->peekAtDirty(&dirty);
 
@@ -198,6 +191,12 @@
         return;
     }
 
+    if (transformUpdateNeeded) {
+        // update the transform in window of the layer to reset its origin wrt light source position
+        Matrix4 windowTransform;
+        info.damageAccumulator->computeCurrentTransform(&windowTransform);
+        mLayer->setWindowTransform(windowTransform);
+    }
 
     if (dirty.intersect(0, 0, getWidth(), getHeight())) {
         dirty.roundOut();