| Index: mojo/services/media/common/cpp/mapped_shared_buffer.cc
|
| diff --git a/mojo/services/media/common/cpp/mapped_shared_buffer.cc b/mojo/services/media/common/cpp/mapped_shared_buffer.cc
|
| index 976858ac6b7ba873ed519ffacd1a3e7749c4ae20..491598acf48505856b5f6f0bf66a739349c44237 100644
|
| --- a/mojo/services/media/common/cpp/mapped_shared_buffer.cc
|
| +++ b/mojo/services/media/common/cpp/mapped_shared_buffer.cc
|
| @@ -37,9 +37,8 @@ void MappedSharedBuffer::InitInternal(const ScopedSharedBufferHandle& handle) {
|
| // TODO(johngro) : It would be nice if we could do something other than
|
| // DCHECK if things don't go exactly our way.
|
| MojoBufferInformation info;
|
| - MojoResult res = MojoGetBufferInformation(handle.get().value(),
|
| - &info,
|
| - sizeof(info));
|
| + MojoResult res =
|
| + MojoGetBufferInformation(handle.get().value(), &info, sizeof(info));
|
| uint64_t size = info.num_bytes;
|
| MOJO_DCHECK(res == MOJO_RESULT_OK);
|
| MOJO_DCHECK(size > 0);
|
| @@ -48,12 +47,9 @@ void MappedSharedBuffer::InitInternal(const ScopedSharedBufferHandle& handle) {
|
| buffer_ptr_.reset();
|
|
|
| void* ptr;
|
| - auto result = MapBuffer(
|
| - handle.get(),
|
| - 0, // offset
|
| - size,
|
| - &ptr,
|
| - MOJO_MAP_BUFFER_FLAG_NONE);
|
| + auto result = MapBuffer(handle.get(),
|
| + 0, // offset
|
| + size, &ptr, MOJO_MAP_BUFFER_FLAG_NONE);
|
| MOJO_DCHECK(result == MOJO_RESULT_OK);
|
| MOJO_DCHECK(ptr);
|
|
|
| @@ -93,7 +89,7 @@ void* MappedSharedBuffer::PtrFromOffset(uint64_t offset) const {
|
| return buffer_ptr_.get() + offset;
|
| }
|
|
|
| -uint64_t MappedSharedBuffer::OffsetFromPtr(void *ptr) const {
|
| +uint64_t MappedSharedBuffer::OffsetFromPtr(void* ptr) const {
|
| MOJO_DCHECK(buffer_ptr_);
|
| if (ptr == nullptr) {
|
| return FifoAllocator::kNullOffset;
|
|
|