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

Unified Diff: ppapi/proxy/ppb_image_data_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_image_data_proxy.cc
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index d1c040cf250eceb66b963a9277feb0758f9a30cf..926d37fca7cd6020ebd7bb2549905e9ec60b1995 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -347,7 +347,7 @@ PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
return PP_TRUE;
}
-int32_t ImageData::GetSharedMemory(int* /* handle */,
+int32_t ImageData::GetSharedMemory(base::SharedMemoryHandle* /* handle */,
uint32_t* /* byte_count */) {
// Not supported in the proxy (this method is for actually implementing the
// proxy in the host).
@@ -555,7 +555,7 @@ PP_Resource PPB_ImageData_Proxy::CreateImageData(
const PP_Size& size,
bool init_to_zero,
PP_ImageDataDesc* desc,
- IPC::PlatformFileForTransit* image_handle,
+ base::SharedMemoryHandle* image_handle,
uint32_t* byte_count) {
HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
if (!dispatcher)
@@ -593,22 +593,14 @@ PP_Resource PPB_ImageData_Proxy::CreateImageData(
return 0;
}
- int local_fd = 0;
- if (enter_resource.object()->GetSharedMemory(&local_fd,
- byte_count) != PP_OK) {
+ base::SharedMemoryHandle local_handle;
+ if (enter_resource.object()->GetSharedMemory(&local_handle, byte_count) !=
+ PP_OK) {
DVLOG(1) << "CreateImageData failed: could not GetSharedMemory";
return 0;
}
-#if defined(OS_WIN)
- *image_handle = dispatcher->ShareHandleWithRemote(
- reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd)), false);
-#elif defined(OS_POSIX)
- *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false);
-#else
- #error Not implemented.
-#endif
-
+ *image_handle = dispatcher->ShareSharedMemoryHandleWithRemote(local_handle);
return resource.Release();
}
@@ -623,7 +615,7 @@ void PPB_ImageData_Proxy::OnHostMsgCreatePlatform(
// Clear |desc| so we don't send unitialized memory to the plugin.
// https://crbug.com/391023.
*desc = PP_ImageDataDesc();
- IPC::PlatformFileForTransit image_handle;
+ base::SharedMemoryHandle image_handle;
uint32_t byte_count;
PP_Resource resource =
CreateImageData(instance,
@@ -651,7 +643,7 @@ void PPB_ImageData_Proxy::OnHostMsgCreateSimple(
// Clear |desc| so we don't send unitialized memory to the plugin.
// https://crbug.com/391023.
*desc = PP_ImageDataDesc();
- IPC::PlatformFileForTransit image_handle;
+ base::SharedMemoryHandle image_handle;
uint32_t byte_count;
PP_Resource resource =
CreateImageData(instance,

Powered by Google App Engine
This is Rietveld 408576698