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

Unified Diff: content/renderer/pepper/pepper_video_encoder_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_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index 494548d7dc94e8994e186642573b22995925ef49..6b778dcbef52a5ac4c8129834ce8afb233bf1f2b 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -391,9 +391,8 @@ void PepperVideoEncoderHost::RequireBitstreamBuffers(
for (size_t i = 0; i < shm_buffers_.size(); ++i) {
encoder_->UseOutputBitstreamBuffer(shm_buffers_[i]->ToBitstreamBuffer());
handles.push_back(SerializedHandle(
- renderer_ppapi_host_->ShareHandleWithRemote(
- PlatformFileFromSharedMemoryHandle(shm_buffers_[i]->shm->handle()),
- false),
+ renderer_ppapi_host_->ShareSharedMemoryHandleWithRemote(
+ shm_buffers_[i]->shm->handle()),
output_buffer_size));
}
@@ -601,11 +600,10 @@ void PepperVideoEncoderHost::AllocateVideoFrames() {
}
DCHECK(get_video_frames_reply_context_.is_valid());
- get_video_frames_reply_context_.params.AppendHandle(SerializedHandle(
- renderer_ppapi_host_->ShareHandleWithRemote(
- PlatformFileFromSharedMemoryHandle(buffer_manager_.shm()->handle()),
- false),
- total_size));
+ get_video_frames_reply_context_.params.AppendHandle(
+ SerializedHandle(renderer_ppapi_host_->ShareSharedMemoryHandleWithRemote(
+ buffer_manager_.shm()->handle()),
+ total_size));
host()->SendReply(get_video_frames_reply_context_,
PpapiPluginMsg_VideoEncoder_GetVideoFramesReply(

Powered by Google App Engine
This is Rietveld 408576698