OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/renderer/pepper/resource_converter.h" | 5 #include "content/renderer/pepper/resource_converter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "content/public/renderer/renderer_ppapi_host.h" | 9 #include "content/public/renderer/renderer_ppapi_host.h" |
10 #include "content/renderer/pepper/pepper_file_system_host.h" | 10 #include "content/renderer/pepper/pepper_file_system_host.h" |
| 11 #include "content/renderer/pepper/pepper_media_stream_audio_track_host.h" |
11 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" | 12 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" |
12 #include "ipc/ipc_message.h" | 13 #include "ipc/ipc_message.h" |
13 #include "ppapi/host/ppapi_host.h" | 14 #include "ppapi/host/ppapi_host.h" |
14 #include "ppapi/host/resource_host.h" | 15 #include "ppapi/host/resource_host.h" |
15 #include "ppapi/proxy/ppapi_messages.h" | 16 #include "ppapi/proxy/ppapi_messages.h" |
16 #include "ppapi/shared_impl/resource_var.h" | 17 #include "ppapi/shared_impl/resource_var.h" |
17 #include "ppapi/shared_impl/scoped_pp_var.h" | 18 #include "ppapi/shared_impl/scoped_pp_var.h" |
18 #include "third_party/WebKit/public/platform/WebFileSystem.h" | 19 #include "third_party/WebKit/public/platform/WebFileSystem.h" |
19 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 20 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
20 #include "third_party/WebKit/public/web/WebDOMFileSystem.h" | 21 #include "third_party/WebKit/public/web/WebDOMFileSystem.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 *pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost( | 106 *pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost( |
106 scoped_ptr<ppapi::host::ResourceHost>( | 107 scoped_ptr<ppapi::host::ResourceHost>( |
107 new PepperMediaStreamVideoTrackHost(host, instance, 0, track))); | 108 new PepperMediaStreamVideoTrackHost(host, instance, 0, track))); |
108 if (*pending_renderer_id == 0) | 109 if (*pending_renderer_id == 0) |
109 return false; | 110 return false; |
110 | 111 |
111 create_message->reset( | 112 create_message->reset( |
112 new PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost(id)); | 113 new PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost(id)); |
113 return true; | 114 return true; |
114 } else if (track.source().type() == blink::WebMediaStreamSource::TypeAudio) { | 115 } else if (track.source().type() == blink::WebMediaStreamSource::TypeAudio) { |
115 // TODO(penghuang): support audio track. | 116 *pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost( |
116 return false; | 117 scoped_ptr<ppapi::host::ResourceHost>( |
| 118 new PepperMediaStreamAudioTrackHost(host, instance, 0, track))); |
| 119 if (*pending_renderer_id == 0) |
| 120 return false; |
| 121 |
| 122 create_message->reset( |
| 123 new PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost(id)); |
| 124 return true; |
117 } | 125 } |
118 | 126 |
119 return false; | 127 return false; |
120 } | 128 } |
121 | 129 |
122 } // namespace | 130 } // namespace |
123 | 131 |
124 ResourceConverter::~ResourceConverter() {} | 132 ResourceConverter::~ResourceConverter() {} |
125 | 133 |
126 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, | 134 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 const IPC::Message& create_message, | 217 const IPC::Message& create_message, |
210 const IPC::Message& browser_host_create_message) { | 218 const IPC::Message& browser_host_create_message) { |
211 scoped_refptr<HostResourceVar> result = | 219 scoped_refptr<HostResourceVar> result = |
212 CreateResourceVar(pending_renderer_id, create_message); | 220 CreateResourceVar(pending_renderer_id, create_message); |
213 browser_host_create_messages_.push_back(browser_host_create_message); | 221 browser_host_create_messages_.push_back(browser_host_create_message); |
214 browser_vars.push_back(result); | 222 browser_vars.push_back(result); |
215 return result; | 223 return result; |
216 } | 224 } |
217 | 225 |
218 } // namespace content | 226 } // namespace content |
OLD | NEW |