summaryrefslogtreecommitdiff
path: root/libs/ui/Region.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-03-17 00:10:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-17 00:10:10 -0700
commit9260be0e7964d8e35da2e2ba4354d0e97633aafa (patch)
treea7502118c6abd0c1aa64eba593b5e63aba3715fa /libs/ui/Region.cpp
parent4fd8d4cbce1793ae3b5b9e50038c653bae7b0d02 (diff)
parentd0b55c011a311b677493ba72804bf1bc4df68224 (diff)
am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2': fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
Diffstat (limited to 'libs/ui/Region.cpp')
-rw-r--r--libs/ui/Region.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 1994f6a432..a060a5f39d 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);