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

Unified Diff: content/renderer/pepper/pepper_video_source_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: 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: content/renderer/pepper/pepper_video_source_host.cc
diff --git a/content/renderer/pepper/pepper_video_source_host.cc b/content/renderer/pepper/pepper_video_source_host.cc
index fdaf42b614c428b10d7ce09a2c46182da6e1d7e5..f6942a8592bbbade57d2b1634a4a128128c4801b 100644
--- a/content/renderer/pepper/pepper_video_source_host.cc
+++ b/content/renderer/pepper/pepper_video_source_host.cc
@@ -120,15 +120,15 @@ void PepperVideoSourceHost::SendGetFrameReply() {
// Note: We try to reuse the shared memory for the previous frame here. This
// means that the previous frame may be overwritten and is no longer valid
// after calling this function again.
- IPC::PlatformFileForTransit image_handle;
+ base::SharedMemoryHandle image_handle;
uint32_t byte_count;
if (shared_image_.get() && dst_size.width() == shared_image_->width() &&
dst_size.height() == shared_image_->height()) {
// We have already allocated the correct size in shared memory. We need to
// duplicate the handle for IPC however, which will close down the
// duplicated handle when it's done.
- int local_fd = 0;
- if (shared_image_->GetSharedMemory(&local_fd, &byte_count) != PP_OK) {
+ base::SharedMemoryHandle local_handle;
+ if (shared_image_->GetSharedMemory(&local_handle, &byte_count) != PP_OK) {
SendGetFrameErrorReply(PP_ERROR_FAILED);
return;
}
@@ -140,14 +140,7 @@ void PepperVideoSourceHost::SendGetFrameReply() {
return;
}
-#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);
} else {
// We need to allocate new shared memory.
shared_image_ = NULL; // Release any previous image.

Powered by Google App Engine
This is Rietveld 408576698