summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-01-22 00:13:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 00:13:22 +0000
commite18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c (patch)
tree0e5500a3abd93afd29cfc63977d44aa5caf796cd /libs
parenta5cbb1f18b6eb4e0db27d98bea0731393b7438d1 (diff)
parent4ecf6ec932644b680d5e13791275dd3bc1a1ee6d (diff)
downloadframeworks_native-e18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c.zip
frameworks_native-e18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c.tar.gz
frameworks_native-e18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c.tar.bz2
am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"
* commit '4ecf6ec932644b680d5e13791275dd3bc1a1ee6d': Restore Region::set(uint32_t, uint32_t)
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/Region.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 06ab3d0..91fa216 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -260,6 +260,12 @@ void Region::set(int32_t w, int32_t h)
mStorage.add(Rect(w, h));
}
+void Region::set(uint32_t w, uint32_t h)
+{
+ mStorage.clear();
+ mStorage.add(Rect(w, h));
+}
+
bool Region::isTriviallyEqual(const Region& region) const {
return begin() == region.begin();
}