commit 678ff81105753656aa4822f4f675ef96dc9d2b83
author Chris Craik <ccraik@google.com> Tue Mar 01 13:27:54 2016 -0800
committer Chris Craik <ccraik@google.com> Wed Mar 02 10:29:15 2016 -0800
tree 695ff095d9b5c839a51316c9b3f8976682be7d5e
parent 82197c33a23a130acd93dcf54e70138a7e7ba970

Clip projected ripples to outlines

bug:27343928

Also fixes positioning of ripples to a scrolled projection receiver.

Change-Id: I74b7233c46d7c15839ca8bf50e188ba6646d7432

libs/hwui/LayerBuilder.cpp

diff --git a/libs/hwui/LayerBuilder.cpp b/libs/hwui/LayerBuilder.cpp
index bc39621..c5af279 100644
--- a/libs/hwui/LayerBuilder.cpp
+++ b/libs/hwui/LayerBuilder.cpp
@@ -140,7 +140,10 @@
         // Identical round rect clip state means both ops will clip in the same way, or not at all.
         // As the state objects are const, we can compare their pointers to determine mergeability
         if (lhs->roundRectClipState != rhs->roundRectClipState) return false;
-        if (lhs->projectionPathMask != rhs->projectionPathMask) return false;
+
+        // Local masks prevent merge, since they're potentially in different coordinate spaces
+        if (lhs->computedState.localProjectionPathMask
+                || rhs->computedState.localProjectionPathMask) return false;
 
         /* Clipping compatibility check
          *