am e18155e1: am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"

* commit 'e18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c':
  Restore Region::set(uint32_t, uint32_t)
This commit is contained in:
Dan Stoza 2015-01-22 01:49:34 +00:00 committed by Android Git Automerger
commit 31bf9335ca
2 changed files with 7 additions and 0 deletions

View File

@ -59,6 +59,7 @@ public:
void clear();
void set(const Rect& r);
void set(int32_t w, int32_t h);
void set(uint32_t w, uint32_t h);
Region& orSelf(const Rect& rhs);
Region& xorSelf(const Rect& rhs);

View File

@ -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();
}