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

Side by Side Diff: ppapi/proxy/ppb_audio_proxy.h

Issue 6341015: Fix some bugs with incorrect ! (both missing and extra) in the proxy error ha... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/ppb_audio_config_proxy.cc ('k') | ppapi/proxy/ppb_audio_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_PROXY_PPB_AUDIO_PROXY_H_ 5 #ifndef PPAPI_PROXY_PPB_AUDIO_PROXY_H_
6 #define PPAPI_PROXY_PPB_AUDIO_PROXY_H_ 6 #define PPAPI_PROXY_PPB_AUDIO_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/shared_memory.h" 9 #include "base/shared_memory.h"
10 #include "base/sync_socket.h" 10 #include "base/sync_socket.h"
11 #include "ipc/ipc_platform_file.h" 11 #include "ipc/ipc_platform_file.h"
12 #include "ppapi/c/pp_instance.h" 12 #include "ppapi/c/pp_instance.h"
13 #include "ppapi/c/pp_module.h" 13 #include "ppapi/c/pp_module.h"
14 #include "ppapi/c/pp_resource.h" 14 #include "ppapi/c/pp_resource.h"
15 #include "ppapi/cpp/completion_callback.h" 15 #include "ppapi/cpp/completion_callback.h"
16 #include "ppapi/proxy/interface_proxy.h" 16 #include "ppapi/proxy/interface_proxy.h"
17 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" 17 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
18 18
19 struct PPB_Audio; 19 struct PPB_Audio;
20 20
21 namespace pp { 21 namespace pp {
22 namespace proxy { 22 namespace proxy {
23 23
24 struct PPBAudio_NotifyAudioStreamCreated_Params;
25 class HostResource; 24 class HostResource;
26 25
27 class PPB_Audio_Proxy : public InterfaceProxy { 26 class PPB_Audio_Proxy : public InterfaceProxy {
28 public: 27 public:
29 PPB_Audio_Proxy(Dispatcher* dispatcher, const void* target_interface); 28 PPB_Audio_Proxy(Dispatcher* dispatcher, const void* target_interface);
30 virtual ~PPB_Audio_Proxy(); 29 virtual ~PPB_Audio_Proxy();
31 30
32 const PPB_Audio* ppb_audio_target() const { 31 const PPB_Audio* ppb_audio_target() const {
33 return static_cast<const PPB_Audio*>(target_interface()); 32 return static_cast<const PPB_Audio*>(target_interface());
34 } 33 }
35 34
36 // InterfaceProxy implementation. 35 // InterfaceProxy implementation.
37 virtual const void* GetSourceInterface() const; 36 virtual const void* GetSourceInterface() const;
38 virtual InterfaceID GetInterfaceId() const; 37 virtual InterfaceID GetInterfaceId() const;
39 virtual bool OnMessageReceived(const IPC::Message& msg); 38 virtual bool OnMessageReceived(const IPC::Message& msg);
40 39
41 private: 40 private:
42 // Plugin->renderer message handlers. 41 // Plugin->renderer message handlers.
43 void OnMsgCreate(PP_Instance instance_id, 42 void OnMsgCreate(PP_Instance instance_id,
44 const HostResource& config_id, 43 const HostResource& config_id,
45 HostResource* result); 44 HostResource* result);
46 void OnMsgStartOrStop(const HostResource& audio_id, bool play); 45 void OnMsgStartOrStop(const HostResource& audio_id, bool play);
47 46
48 // Renderer->plugin message handlers. 47 // Renderer->plugin message handlers.
49 void OnMsgNotifyAudioStreamCreated( 48 void OnMsgNotifyAudioStreamCreated(const HostResource& audio_id,
50 const PPBAudio_NotifyAudioStreamCreated_Params& params); 49 int32_t result_code,
50 IPC::PlatformFileForTransit socket_handle,
51 base::SharedMemoryHandle handle,
52 uint32_t length);
51 53
52 void AudioChannelConnected(int32_t result, 54 void AudioChannelConnected(int32_t result,
53 const HostResource& resource); 55 const HostResource& resource);
54 56
55 // In the renderer, this is called in response to a stream created message. 57 // In the renderer, this is called in response to a stream created message.
56 // It will retrieve the shared memory and socket handles and place them into 58 // It will retrieve the shared memory and socket handles and place them into
57 // the given out params. The return value is a PPAPI error code. 59 // the given out params. The return value is a PPAPI error code.
58 // 60 //
59 // The input arguments should be initialized to 0 or -1, depending on the 61 // The input arguments should be initialized to 0 or -1, depending on the
60 // platform's default invalid handle values. On error, some of these 62 // platform's default invalid handle values. On error, some of these
61 // arguments may be written to, and others may be untouched, depending on 63 // arguments may be written to, and others may be untouched, depending on
62 // where the error occurred. 64 // where the error occurred.
63 int32_t GetAudioConnectedHandles( 65 int32_t GetAudioConnectedHandles(
64 const HostResource& resource, 66 const HostResource& resource,
65 IPC::PlatformFileForTransit* foreign_socket_handle, 67 IPC::PlatformFileForTransit* foreign_socket_handle,
66 base::SharedMemoryHandle* foreign_shared_memory_handle, 68 base::SharedMemoryHandle* foreign_shared_memory_handle,
67 uint32_t* shared_memory_length); 69 uint32_t* shared_memory_length);
68 70
69 CompletionCallbackFactory<PPB_Audio_Proxy, 71 CompletionCallbackFactory<PPB_Audio_Proxy,
70 ProxyNonThreadSafeRefCount> callback_factory_; 72 ProxyNonThreadSafeRefCount> callback_factory_;
71 73
72 DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Proxy); 74 DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Proxy);
73 }; 75 };
74 76
75 } // namespace proxy 77 } // namespace proxy
76 } // namespace pp 78 } // namespace pp
77 79
78 #endif // PPAPI_PROXY_PPB_AUDIO_PROXY_H_ 80 #endif // PPAPI_PROXY_PPB_AUDIO_PROXY_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/ppb_audio_config_proxy.cc ('k') | ppapi/proxy/ppb_audio_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698