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

Unified Diff: ppapi/proxy/ppb_buffer_proxy.cc

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another nits pass. 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
Index: ppapi/proxy/ppb_buffer_proxy.cc
diff --git a/ppapi/proxy/ppb_buffer_proxy.cc b/ppapi/proxy/ppb_buffer_proxy.cc
index c6d8cdd626b427e2e584975d4458117525fccced..5f597637c186817752c68806bd3cca07768a8a13 100644
--- a/ppapi/proxy/ppb_buffer_proxy.cc
+++ b/ppapi/proxy/ppb_buffer_proxy.cc
@@ -59,7 +59,7 @@ void Buffer::Unmap() {
shm_.Unmap();
}
-int32_t Buffer::GetSharedMemory(int* out_handle) {
+int32_t Buffer::GetSharedMemory(base::SharedMemory** out_handle) {
NOTREACHED();
return PP_ERROR_NOTSUPPORTED;
}
@@ -132,24 +132,14 @@ void PPB_Buffer_Proxy::OnMsgCreate(
local_buffer_resource, false);
if (trusted_buffer.failed())
return;
- int local_fd;
- if (trusted_buffer.object()->GetSharedMemory(&local_fd) != PP_OK)
+ base::SharedMemory* local_shm;
+ if (trusted_buffer.object()->GetSharedMemory(&local_shm) != PP_OK)
return;
result_resource->SetHostResource(instance, local_buffer_resource);
- // TODO(piman/brettw): Change trusted interface to return a PP_FileHandle,
- // those casts are ugly.
- base::PlatformFile platform_file =
-#if defined(OS_WIN)
- reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd));
-#elif defined(OS_POSIX)
- local_fd;
-#else
- #error Not implemented.
-#endif
result_shm_handle->set_shmem(
- dispatcher->ShareHandleWithRemote(platform_file, false), size);
+ dispatcher->ShareSharedMemoryHandleWithRemote(local_shm->handle()), size);
}
} // namespace proxy

Powered by Google App Engine
This is Rietveld 408576698