summaryrefslogtreecommitdiff
path: root/libs/hwui/Snapshot.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-02-21 11:30:22 -0800
committer Chris Craik <ccraik@google.com> 2013-02-21 16:12:00 -0800
commitb98a016c6769b9e80d392df22fe77a2fca048d9f (patch)
tree6a4adcd9e871baab9aae6f2f0ad80670ad4f66bd /libs/hwui/Snapshot.cpp
parent2b3a47b9ce0f422323395286937944a2afa51ed6 (diff)
Fix clipping and stencil layer issues
bug:8235699 Ensure rectangle clipping operations disable deferring when necessary (i.e., when the op might create a non-rect region), including in DisplayList::setViewProperties Additionally, makes clipping with a kUnion always use a region, for consistency with software rendering Change-Id: I6730f1a80250bcf3f91cd4afde646d470a12dbc2
Diffstat (limited to 'libs/hwui/Snapshot.cpp')
-rw-r--r--libs/hwui/Snapshot.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index 19a5db75b5df..923913e864a9 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -132,15 +132,6 @@ bool Snapshot::clipTransformed(const Rect& r, SkRegion::Op op) {
}
break;
}
- case SkRegion::kUnion_Op: {
- if (CC_UNLIKELY(!clipRegion->isEmpty())) {
- ensureClipRegion();
- clipped = clipRegionOp(r.left, r.top, r.right, r.bottom, SkRegion::kUnion_Op);
- } else {
- clipped = clipRect->unionWith(r);
- }
- break;
- }
case SkRegion::kReplace_Op: {
setClip(r.left, r.top, r.right, r.bottom);
clipped = true;