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

Unified Diff: content/renderer/pepper/pepper_compositor_host.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: Remove changes to base/memory. 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: content/renderer/pepper/pepper_compositor_host.cc
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
index e0045d97c3c30d5ee3630ae9a943c8f9aa2127c1..a7ab40c5821904b5f8960d84e9b786091d710d3a 100644
--- a/content/renderer/pepper/pepper_compositor_host.cc
+++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -116,7 +116,7 @@ int32_t VerifyCommittedLayer(
return PP_ERROR_BADARGUMENT;
}
- int handle;
+ base::SharedMemoryHandle handle;
uint32_t byte_count;
if (enter.object()->GetSharedMemory(&handle, &byte_count) != PP_OK)
return PP_ERROR_FAILED;
@@ -133,7 +133,8 @@ int32_t VerifyCommittedLayer(
return PP_ERROR_FAILED;
}
#else
- base::SharedMemoryHandle shm_handle(dup(handle), false);
+ base::SharedMemoryHandle shm_handle =
+ base::SharedMemory::DeepCopyHandle(handle, false);
piman 2015/06/01 22:16:08 Can you do this in both OS_WIN and !OS_WIN paths?
erikchen 2015/06/01 23:48:53 Yes. I will do so in a follow up CL. DeepCopyHandl
#endif
image_shm->reset(new base::SharedMemory(shm_handle, true));
if (!(*image_shm)->Map(desc.stride * desc.size.height)) {

Powered by Google App Engine
This is Rietveld 408576698