ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c02377e6: am 4d769d8b: Merge "libui: Clean up Fence and Region flattening"

Browse Source 
* commit 'c02377e6fd1e7380816ce5c4902330226f20721a':
  libui: Clean up Fence and Region flattening
This commit is contained in:
Dan Stoza 2015-04-15 20:29:45 +00:00 committed by Android Git Automerger
commit a161b6cee9
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ui/Fence.cpp
View File

@ -130,7 +130,7 @@ nsecs_t Fence::getSignalTime() const {
}
size_t Fence::getFlattenedSize() const {
return 1;
return 4;
}
size_t Fence::getFdCount() const {
@ -141,7 +141,9 @@ status_t Fence::flatten(void*& buffer, size_t& size, int*& fds, size_t& count) c
if (size < getFlattenedSize() || count < getFdCount()) {
return NO_MEMORY;
}
FlattenableUtils::write(buffer, size, getFdCount());
// Cast to uint32_t since the size of a size_t can vary between 32- and
// 64-bit processes
FlattenableUtils::write(buffer, size, static_cast<uint32_t>(getFdCount()));
if (isValid()) {
*fds++ = mFenceFd;
count--;

49
libs/ui/Region.cpp
View File

@ -753,35 +753,52 @@ void Region::translate(Region& dst, const Region& reg, int dx, int dy)
// ----------------------------------------------------------------------------
size_t Region::getFlattenedSize() const {
return mStorage.size() * sizeof(Rect);
return sizeof(uint32_t) + mStorage.size() * sizeof(Rect);
}
status_t Region::flatten(void* buffer, size_t size) const {
#if VALIDATE_REGIONS
validate(*this, "Region::flatten");
#endif
if (size < mStorage.size() * sizeof(Rect)) {
if (size < getFlattenedSize()) {
return NO_MEMORY;
}
Rect* rects = reinterpret_cast<Rect*>(buffer);
memcpy(rects, mStorage.array(), mStorage.size() * sizeof(Rect));
// Cast to uint32_t since the size of a size_t can vary between 32- and
// 64-bit processes
FlattenableUtils::write(buffer, size, static_cast<uint32_t>(mStorage.size()));
for (auto rect : mStorage) {
status_t result = rect.flatten(buffer, size);
if (result != NO_ERROR) {
return result;
}
FlattenableUtils::advance(buffer, size, sizeof(rect));
}
return NO_ERROR;
}
status_t Region::unflatten(void const* buffer, size_t size) {
Region result;
if (size >= sizeof(Rect)) {
Rect const* rects = reinterpret_cast<Rect const*>(buffer);
size_t count = size / sizeof(Rect);
if (count > 0) {
result.mStorage.clear();
ssize_t err = result.mStorage.insertAt(0, count);
if (err < 0) {
return status_t(err);
}
memcpy(result.mStorage.editArray(), rects, count*sizeof(Rect));
}
if (size < sizeof(uint32_t)) {
return NO_MEMORY;
}
uint32_t numRects = 0;
FlattenableUtils::read(buffer, size, numRects);
if (size < numRects * sizeof(Rect)) {
return NO_MEMORY;
}
Region result;
result.mStorage.clear();
for (size_t r = 0; r < numRects; ++r) {
Rect rect;
status_t status = rect.unflatten(buffer, size);
if (status != NO_ERROR) {
return status;
}
FlattenableUtils::advance(buffer, size, sizeof(rect));
result.mStorage.push_back(rect);
}
#if VALIDATE_REGIONS
validate(result, "Region::unflatten");
#endif