diff options
| author | Mathias Agopian <mathias@google.com> | 2011-03-17 00:13:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 00:13:49 -0700 |
| commit | 939fee8819ac714af6f99b1d8e0bd2ff6626a356 (patch) | |
| tree | e6512f50f1ed5a34084f3f8939134764c9a33570 /libs/ui | |
| parent | b290278a67675c927808586c538518dadb78ca96 (diff) | |
| parent | 679c2bc790cd0bec55e22bda80e7f37c01f4516b (diff) | |
| download | frameworks_native-939fee8819ac714af6f99b1d8e0bd2ff6626a356.zip frameworks_native-939fee8819ac714af6f99b1d8e0bd2ff6626a356.tar.gz frameworks_native-939fee8819ac714af6f99b1d8e0bd2ff6626a356.tar.bz2 | |
am e22aa623: am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
* commit 'e22aa62362a3007ee59ac62d4b5969e216987995':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/Region.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp index 1994f6a..a060a5f 100644 --- a/libs/ui/Region.cpp +++ b/libs/ui/Region.cpp @@ -56,6 +56,9 @@ Region::Region() Region::Region(const Region& rhs) : mBounds(rhs.mBounds), mStorage(rhs.mStorage) { +#if VALIDATE_REGIONS + validate(rhs, "rhs copy-ctor"); +#endif } Region::Region(const Rect& rhs) @@ -76,7 +79,8 @@ Region::~Region() Region& Region::operator = (const Region& rhs) { #if VALIDATE_REGIONS - validate(rhs, "operator="); + validate(*this, "this->operator="); + validate(rhs, "rhs.operator="); #endif mBounds = rhs.mBounds; mStorage = rhs.mStorage; @@ -366,6 +370,12 @@ void Region::boolean_operation(int op, Region& dst, const Region& lhs, const Region& rhs, int dx, int dy) { +#if VALIDATE_REGIONS + validate(lhs, "boolean_operation (before): lhs"); + validate(rhs, "boolean_operation (before): rhs"); + validate(dst, "boolean_operation (before): dst"); +#endif + size_t lhs_count; Rect const * const lhs_rects = lhs.getArray(&lhs_count); |