| Index: content/renderer/pepper/ppb_image_data_impl.cc
|
| diff --git a/content/renderer/pepper/ppb_image_data_impl.cc b/content/renderer/pepper/ppb_image_data_impl.cc
|
| index cac25c301dd212e65cca91cde359a3a4b934bb3f..767b5fa7097f47a79f68bc9449df10efb7dc9bcd 100644
|
| --- a/content/renderer/pepper/ppb_image_data_impl.cc
|
| +++ b/content/renderer/pepper/ppb_image_data_impl.cc
|
| @@ -105,7 +105,8 @@ void* PPB_ImageData_Impl::Map() { return backend_->Map(); }
|
|
|
| void PPB_ImageData_Impl::Unmap() { backend_->Unmap(); }
|
|
|
| -int32_t PPB_ImageData_Impl::GetSharedMemory(int* handle, uint32_t* byte_count) {
|
| +int32_t PPB_ImageData_Impl::GetSharedMemory(base::SharedMemoryHandle* handle,
|
| + uint32_t* byte_count) {
|
| return backend_->GetSharedMemory(handle, byte_count);
|
| }
|
|
|
| @@ -187,11 +188,11 @@ void ImageDataPlatformBackend::Unmap() {
|
| // in the future to save some memory.
|
| }
|
|
|
| -int32_t ImageDataPlatformBackend::GetSharedMemory(int* handle,
|
| - uint32_t* byte_count) {
|
| +int32_t ImageDataPlatformBackend::GetSharedMemory(
|
| + base::SharedMemoryHandle* handle,
|
| + uint32_t* byte_count) {
|
| *byte_count = dib_->size();
|
| - *handle = reinterpret_cast<int>(PlatformFileFromSharedMemoryHandle(
|
| - dib_->handle()));
|
| + *handle = dib_->handle();
|
| return PP_OK;
|
| }
|
|
|
| @@ -249,11 +250,11 @@ void ImageDataSimpleBackend::Unmap() {
|
| shared_memory_->Unmap();
|
| }
|
|
|
| -int32_t ImageDataSimpleBackend::GetSharedMemory(int* handle,
|
| - uint32_t* byte_count) {
|
| +int32_t ImageDataSimpleBackend::GetSharedMemory(
|
| + base::SharedMemoryHandle* handle,
|
| + uint32_t* byte_count) {
|
| *byte_count = skia_bitmap_.getSize();
|
| - *handle = reinterpret_cast<int>(PlatformFileFromSharedMemoryHandle(
|
| - shared_memory_->handle()));
|
| + *handle = shared_memory_->handle();
|
| return PP_OK;
|
| }
|
|
|
|
|