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

Unified Diff: ppapi/proxy/ppb_audio_proxy.cc

Issue 10912011: Change NaCl IPC PPAPI proxy startup to support a NaCl-Browser process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ppapi/proxy/ppapi_param_traits.cc ('k') | ppapi/proxy/serialized_structs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_audio_proxy.cc
===================================================================
--- ppapi/proxy/ppb_audio_proxy.cc (revision 154143)
+++ ppapi/proxy/ppb_audio_proxy.cc (working copy)
@@ -26,6 +26,7 @@
#include "ppapi/thunk/thunk.h"
using ppapi::IntToPlatformFile;
+using ppapi::proxy::SerializedHandle;
using ppapi::thunk::EnterResourceNoLock;
using ppapi::thunk::PPB_Audio_API;
using ppapi::thunk::PPB_AudioConfig_API;
@@ -253,14 +254,14 @@
// inconvenient to clean up. Our IPC code will automatically handle this for
// us, as long as the remote side always closes the handles it receives
// (in OnMsgNotifyAudioStreamCreated), even in the failure case.
- ppapi::proxy::SerializedHandle fd_wrapper(socket_handle);
+ SerializedHandle fd_wrapper(SerializedHandle::SOCKET, socket_handle);
// Note that we must call TotalSharedMemorySizeInBytes because
// Audio allocates extra space in shared memory for book-keeping, so the
// actual size of the shared memory buffer is larger than audio_buffer_length.
// When sending to NaCl, NaClIPCAdapter expects this size to match the size
// of the full shared memory buffer.
- ppapi::proxy::SerializedHandle handle_wrapper(
+ SerializedHandle handle_wrapper(
shared_memory,
media::TotalSharedMemorySizeInBytes(audio_buffer_length));
dispatcher()->Send(new PpapiMsg_PPBAudio_NotifyAudioStreamCreated(
@@ -309,8 +310,8 @@
void PPB_Audio_Proxy::OnMsgNotifyAudioStreamCreated(
const HostResource& audio_id,
int32_t result_code,
- ppapi::proxy::SerializedHandle socket_handle,
- ppapi::proxy::SerializedHandle handle) {
+ SerializedHandle socket_handle,
+ SerializedHandle handle) {
CHECK(socket_handle.is_socket());
CHECK(handle.is_shmem());
EnterPluginFromHostResource<PPB_Audio_API> enter(audio_id);
« no previous file with comments | « ppapi/proxy/ppapi_param_traits.cc ('k') | ppapi/proxy/serialized_structs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698