ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc - Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (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/native_client/src/shared/ppapi_proxy/DEPS ('k') | ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc

===================================================================

--- ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc (revision 152430)

+++ ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc (working copy)

@@ -13,7 +13,6 @@

#include "native_client/src/shared/ppapi_proxy/utility.h"

#include "native_client/src/trusted/desc/nacl_desc_invalid.h"

#include "native_client/src/trusted/desc/nacl_desc_wrapper.h"

-#include "media/audio/shared_memory_util.h"

#include "ppapi/c/ppb_audio.h"

#include "ppapi/c/ppb_audio_config.h"

#include "ppapi/c/pp_errors.h"

@@ -89,7 +88,7 @@

return;

}

size_t total_shared_memory_size =

- media::TotalSharedMemorySizeInBytes(audio_buffer_size);

+ ppapi_proxy::TotalAudioSharedMemorySizeInBytes(audio_buffer_size);

nacl::DescWrapperFactory factory;

NaClHandle nacl_shm_handle = NaClHandle(shared_memory_handle);

NaClHandle nacl_sync_handle = NaClHandle(sync_socket_handle);

Property changes on: ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/DEPS ('k') | ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h » ('j') | no next file with comments »