summaryrefslogtreecommitdiffstats
path: root/libs/hwui/Snapshot.h
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-07-30 11:36:12 -0700
committerRomain Guy <romainguy@google.com>2010-07-30 11:40:21 -0700
commitb82da65cb1601be504241f36778395cd6cb9f87b (patch)
tree19fc51fb41e806817a4895212b8111fa9131af04 /libs/hwui/Snapshot.h
parentb422107d1d599e5d43cc47cd7e1342976b6b5b1a (diff)
downloadframeworks_base-b82da65cb1601be504241f36778395cd6cb9f87b.zip
frameworks_base-b82da65cb1601be504241f36778395cd6cb9f87b.tar.gz
frameworks_base-b82da65cb1601be504241f36778395cd6cb9f87b.tar.bz2
Fix improper clipping after a save()
Change-Id: I13426a67f20d77e2710bd500d82884098f4be97c
Diffstat (limited to 'libs/hwui/Snapshot.h')
-rw-r--r--libs/hwui/Snapshot.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/hwui/Snapshot.h b/libs/hwui/Snapshot.h
index 020bdb0..399ae68 100644
--- a/libs/hwui/Snapshot.h
+++ b/libs/hwui/Snapshot.h
@@ -57,8 +57,13 @@ public:
flags(0),
previous(s),
layer(NULL),
- fbo(s->fbo),
- localClip(s->localClip) {
+ fbo(s->fbo) {
+ if ((s->flags & Snapshot::kFlagClipSet) &&
+ !(s->flags & Snapshot::kFlagDirtyLocalClip)) {
+ localClip.set(s->localClip);
+ } else {
+ flags |= Snapshot::kFlagDirtyLocalClip;
+ }
}
/**