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/renderer/media/media_stream_dispatcher.h" | 5 #include "content/renderer/media/media_stream_dispatcher.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "content/common/media/media_stream_messages.h" | 9 #include "content/common/media/media_stream_messages.h" |
10 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" | 10 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" |
11 #include "content/renderer/render_thread_impl.h" | 11 #include "content/renderer/render_thread_impl.h" |
12 #include "content/renderer/render_view_impl.h" | 12 #include "content/renderer/render_view_impl.h" |
| 13 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
13 #include "url/gurl.h" | 14 #include "url/gurl.h" |
14 | 15 |
15 namespace content { | 16 namespace content { |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 bool RemoveStreamDeviceFromArray(const StreamDeviceInfo device_info, | 20 bool RemoveStreamDeviceFromArray(const StreamDeviceInfo device_info, |
20 StreamDeviceInfoArray* array) { | 21 StreamDeviceInfoArray* array) { |
21 for (StreamDeviceInfoArray::iterator device_it = array->begin(); | 22 for (StreamDeviceInfoArray::iterator device_it = array->begin(); |
22 device_it != array->end(); ++device_it) { | 23 device_it != array->end(); ++device_it) { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 | 72 |
72 void MediaStreamDispatcher::GenerateStream( | 73 void MediaStreamDispatcher::GenerateStream( |
73 int request_id, | 74 int request_id, |
74 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, | 75 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, |
75 const StreamOptions& components, | 76 const StreamOptions& components, |
76 const GURL& security_origin) { | 77 const GURL& security_origin) { |
77 DCHECK(main_loop_->BelongsToCurrentThread()); | 78 DCHECK(main_loop_->BelongsToCurrentThread()); |
78 DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")"; | 79 DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")"; |
79 | 80 |
80 requests_.push_back(Request(event_handler, request_id, next_ipc_id_)); | 81 requests_.push_back(Request(event_handler, request_id, next_ipc_id_)); |
81 Send(new MediaStreamHostMsg_GenerateStream(routing_id(), | 82 Send(new MediaStreamHostMsg_GenerateStream( |
82 next_ipc_id_++, | 83 routing_id(), next_ipc_id_++, components, security_origin, |
83 components, | 84 blink::WebUserGestureIndicator::isProcessingUserGesture())); |
84 security_origin)); | |
85 } | 85 } |
86 | 86 |
87 void MediaStreamDispatcher::CancelGenerateStream( | 87 void MediaStreamDispatcher::CancelGenerateStream( |
88 int request_id, | 88 int request_id, |
89 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) { | 89 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) { |
90 DCHECK(main_loop_->BelongsToCurrentThread()); | 90 DCHECK(main_loop_->BelongsToCurrentThread()); |
91 DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream" | 91 DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream" |
92 << ", {request_id = " << request_id << "}"; | 92 << ", {request_id = " << request_id << "}"; |
93 | 93 |
94 RequestList::iterator it = requests_.begin(); | 94 RequestList::iterator it = requests_.begin(); |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 int index) { | 390 int index) { |
391 LabelStreamMap::iterator it = label_stream_map_.find(label); | 391 LabelStreamMap::iterator it = label_stream_map_.find(label); |
392 if (it == label_stream_map_.end() || | 392 if (it == label_stream_map_.end() || |
393 it->second.video_array.size() <= static_cast<size_t>(index)) { | 393 it->second.video_array.size() <= static_cast<size_t>(index)) { |
394 return StreamDeviceInfo::kNoId; | 394 return StreamDeviceInfo::kNoId; |
395 } | 395 } |
396 return it->second.video_array[index].session_id; | 396 return it->second.video_array[index].session_id; |
397 } | 397 } |
398 | 398 |
399 } // namespace content | 399 } // namespace content |
OLD | NEW |