| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/renderer_host/media/media_stream_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
| 6 | 6 |
| 7 #include "content/browser/browser_main_loop.h" | 7 #include "content/browser/browser_main_loop.h" |
| 8 #include "content/browser/child_process_security_policy_impl.h" | 8 #include "content/browser/child_process_security_policy_impl.h" |
| 9 #include "content/common/media/media_stream_messages.h" | 9 #include "content/common/media/media_stream_messages.h" |
| 10 #include "content/common/media/media_stream_options.h" | 10 #include "content/common/media/media_stream_options.h" |
| 11 #include "content/public/browser/render_process_host.h" | 11 #include "content/public/browser/render_process_host.h" |
| 12 #include "url/gurl.h" | 12 #include "url/gurl.h" |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 MediaStreamDispatcherHost::MediaStreamDispatcherHost( | 16 MediaStreamDispatcherHost::MediaStreamDispatcherHost( |
| 17 int render_process_id, | 17 int render_process_id, |
| 18 const ResourceContext::SaltCallback& salt_callback, | 18 const ResourceContext::SaltCallback& salt_callback, |
| 19 MediaStreamManager* media_stream_manager) | 19 MediaStreamManager* media_stream_manager, |
| 20 ResourceContext* resource_context) |
| 20 : BrowserMessageFilter(MediaStreamMsgStart), | 21 : BrowserMessageFilter(MediaStreamMsgStart), |
| 21 render_process_id_(render_process_id), | 22 render_process_id_(render_process_id), |
| 22 salt_callback_(salt_callback), | 23 salt_callback_(salt_callback), |
| 23 media_stream_manager_(media_stream_manager) { | 24 media_stream_manager_(media_stream_manager), |
| 25 resource_context_(resource_context) { |
| 24 } | 26 } |
| 25 | 27 |
| 26 void MediaStreamDispatcherHost::StreamGenerated( | 28 void MediaStreamDispatcherHost::StreamGenerated( |
| 27 int render_view_id, | 29 int render_view_id, |
| 28 int page_request_id, | 30 int page_request_id, |
| 29 const std::string& label, | 31 const std::string& label, |
| 30 const StreamDeviceInfoArray& audio_devices, | 32 const StreamDeviceInfoArray& audio_devices, |
| 31 const StreamDeviceInfoArray& video_devices) { | 33 const StreamDeviceInfoArray& video_devices) { |
| 32 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 34 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 33 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated(" | 35 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated(" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 << render_view_id << ", " | 175 << render_view_id << ", " |
| 174 << page_request_id << ", " | 176 << page_request_id << ", " |
| 175 << type << ", " | 177 << type << ", " |
| 176 << security_origin.spec() << ")"; | 178 << security_origin.spec() << ")"; |
| 177 | 179 |
| 178 if (!IsURLAllowed(security_origin)) | 180 if (!IsURLAllowed(security_origin)) |
| 179 return; | 181 return; |
| 180 | 182 |
| 181 media_stream_manager_->EnumerateDevices( | 183 media_stream_manager_->EnumerateDevices( |
| 182 this, render_process_id_, render_view_id, salt_callback_, | 184 this, render_process_id_, render_view_id, salt_callback_, |
| 183 page_request_id, type, security_origin); | 185 page_request_id, type, security_origin, resource_context_); |
| 184 } | 186 } |
| 185 | 187 |
| 186 void MediaStreamDispatcherHost::OnCancelEnumerateDevices( | 188 void MediaStreamDispatcherHost::OnCancelEnumerateDevices( |
| 187 int render_view_id, | 189 int render_view_id, |
| 188 int page_request_id) { | 190 int page_request_id) { |
| 189 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices(" | 191 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices(" |
| 190 << render_view_id << ", " | 192 << render_view_id << ", " |
| 191 << page_request_id << ")"; | 193 << page_request_id << ")"; |
| 192 media_stream_manager_->CancelRequest(render_process_id_, render_view_id, | 194 media_stream_manager_->CancelRequest(render_process_id_, render_view_id, |
| 193 page_request_id); | 195 page_request_id); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( | 230 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( |
| 229 render_process_id_, url)) { | 231 render_process_id_, url)) { |
| 230 LOG(ERROR) << "MSDH: Renderer requested a URL it's not allowed to use."; | 232 LOG(ERROR) << "MSDH: Renderer requested a URL it's not allowed to use."; |
| 231 return false; | 233 return false; |
| 232 } | 234 } |
| 233 | 235 |
| 234 return true; | 236 return true; |
| 235 } | 237 } |
| 236 | 238 |
| 237 } // namespace content | 239 } // namespace content |
| OLD | NEW |