diff options
| author | Romain Guy <romainguy@google.com> | 2012-02-07 18:22:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-07 18:22:43 -0800 |
| commit | 28587f445a2af6d94d1b215e019e8bcc377c17a1 (patch) | |
| tree | 90bab157eb4c7a9129195b68687272ebe0e91612 | |
| parent | ed219c117d449304bd720fc7d7da1f361015dc58 (diff) | |
| parent | 21c9c8551d9ab36629cabc01f228d3a302e0c673 (diff) | |
| download | frameworks_base-28587f445a2af6d94d1b215e019e8bcc377c17a1.zip frameworks_base-28587f445a2af6d94d1b215e019e8bcc377c17a1.tar.gz frameworks_base-28587f445a2af6d94d1b215e019e8bcc377c17a1.tar.bz2 | |
Merge "Fix the system"
| -rw-r--r-- | libs/hwui/Snapshot.cpp | 8 |
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; } |