summaryrefslogtreecommitdiffstats
path: root/libs/hwui/Snapshot.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-02-07 18:22:07 -0800
committerRomain Guy <romainguy@google.com>2012-02-07 18:22:07 -0800
commit21c9c8551d9ab36629cabc01f228d3a302e0c673 (patch)
tree8bb9e2f85484f4a7de7dfa8508b254faa125e7d7 /libs/hwui/Snapshot.cpp
parent967e2bf3ac8943a8e8a374bf86021915445cda67 (diff)
downloadframeworks_base-21c9c8551d9ab36629cabc01f228d3a302e0c673.zip
frameworks_base-21c9c8551d9ab36629cabc01f228d3a302e0c673.tar.gz
frameworks_base-21c9c8551d9ab36629cabc01f228d3a302e0c673.tar.bz2
Fix the system
Change-Id: Ie097ea5d6c0af9c5929b8c5deb76b4824d5de787
Diffstat (limited to 'libs/hwui/Snapshot.cpp')
-rw-r--r--libs/hwui/Snapshot.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index 5f801fb..de2c674 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -43,6 +43,8 @@ Snapshot::Snapshot(const sp<Snapshot>& s, int saveFlags):
invisible(s->invisible), empty(false),
viewport(s->viewport), height(s->height) {
+ clipRegion = NULL;
+
if (saveFlags & SkCanvas::kMatrix_SaveFlag) {
mTransformRoot.load(*s->transform);
transform = &mTransformRoot;
@@ -57,11 +59,7 @@ Snapshot::Snapshot(const sp<Snapshot>& s, int saveFlags):
if (s->clipRegion) {
mClipRegionRoot.merge(*s->clipRegion);
clipRegion = &mClipRegionRoot;
- } else {
- clipRegion = NULL;
}
-#else
- clipRegion = NULL;
#endif
} else {
clipRect = s->clipRect;
@@ -213,10 +211,12 @@ bool Snapshot::clipTransformed(const Rect& r, SkRegion::Op op) {
void Snapshot::setClip(float left, float top, float right, float bottom) {
clipRect->set(left, top, right, bottom);
+#if STENCIL_BUFFER_SIZE
if (clipRegion) {
clipRegion->clear();
clipRegion = NULL;
}
+#endif
flags |= Snapshot::kFlagClipSet;
}