commit bf27b995ae1bc36ee0b24effcaf41ec477e7fae3
author Chris Craik <ccraik@google.com> Wed Apr 13 15:57:46 2016 -0700
committer Chris Craik <ccraik@google.com> Wed Apr 13 15:59:32 2016 -0700
tree 122aaa198253c48697f21c303e761381650d1cf0
parent e1b1ce77da273da6fc89d04a9c8ec09d0d8adca1

Avoid reentrance on ClipArea APIs

bug:28144676

Calling ClipArea::clipRegion from within ClipArea::clipPathWithTransform
has us handling op-based special casing twice, which caused all clip
paths to appear to be replace ops.

Change-Id: Ib842db53ffed4eee29470f773d59a3a1d07a1a0e

libs/hwui/ClipArea.cpp

diff --git a/libs/hwui/ClipArea.cpp b/libs/hwui/ClipArea.cpp
index 35fe06d..fe68239 100644
--- a/libs/hwui/ClipArea.cpp
+++ b/libs/hwui/ClipArea.cpp
@@ -253,7 +253,9 @@
     path.transform(skTransform, &transformed);
     SkRegion region;
     regionFromPath(transformed, region);
-    clipRegion(region, op);
+    enterRegionMode();
+    mClipRegion.op(region, op);
+    onClipRegionUpdated();
 }
 
 /*