Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1767)

Unified Diff: content/renderer/pepper/ppb_image_data_impl.cc

Issue 1145893009: Change transport dib API to not make copies of SharedMemoryHandle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shared_memory_pepper_rename
Patch Set: Comments from jbauman. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/ppb_image_data_impl.h ('k') | ppapi/proxy/ppb_image_data_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 767b5fa7097f47a79f68bc9449df10efb7dc9bcd..64d269adda9c9b0d5fca1c9a73099c2b57bd7fda 100644
--- a/content/renderer/pepper/ppb_image_data_impl.cc
+++ b/content/renderer/pepper/ppb_image_data_impl.cc
@@ -105,9 +105,9 @@ void* PPB_ImageData_Impl::Map() { return backend_->Map(); }
void PPB_ImageData_Impl::Unmap() { backend_->Unmap(); }
-int32_t PPB_ImageData_Impl::GetSharedMemory(base::SharedMemoryHandle* handle,
+int32_t PPB_ImageData_Impl::GetSharedMemory(base::SharedMemory** shm,
uint32_t* byte_count) {
- return backend_->GetSharedMemory(handle, byte_count);
+ return backend_->GetSharedMemory(shm, byte_count);
}
skia::PlatformCanvas* PPB_ImageData_Impl::GetPlatformCanvas() {
@@ -188,11 +188,10 @@ void ImageDataPlatformBackend::Unmap() {
// in the future to save some memory.
}
-int32_t ImageDataPlatformBackend::GetSharedMemory(
- base::SharedMemoryHandle* handle,
- uint32_t* byte_count) {
+int32_t ImageDataPlatformBackend::GetSharedMemory(base::SharedMemory** shm,
+ uint32_t* byte_count) {
*byte_count = dib_->size();
- *handle = dib_->handle();
+ *shm = dib_->shared_memory();
return PP_OK;
}
@@ -250,11 +249,10 @@ void ImageDataSimpleBackend::Unmap() {
shared_memory_->Unmap();
}
-int32_t ImageDataSimpleBackend::GetSharedMemory(
- base::SharedMemoryHandle* handle,
- uint32_t* byte_count) {
+int32_t ImageDataSimpleBackend::GetSharedMemory(base::SharedMemory** shm,
+ uint32_t* byte_count) {
*byte_count = skia_bitmap_.getSize();
- *handle = shared_memory_->handle();
+ *shm = shared_memory_.get();
return PP_OK;
}
« no previous file with comments | « content/renderer/pepper/ppb_image_data_impl.h ('k') | ppapi/proxy/ppb_image_data_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698