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

Side by Side Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to r260263 Created 6 years, 8 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
OLDNEW
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"
(...skipping 11 matching lines...) Expand all
22 salt_callback_(salt_callback), 22 salt_callback_(salt_callback),
23 media_stream_manager_(media_stream_manager) { 23 media_stream_manager_(media_stream_manager) {
24 } 24 }
25 25
26 void MediaStreamDispatcherHost::StreamGenerated( 26 void MediaStreamDispatcherHost::StreamGenerated(
27 int render_view_id, 27 int render_view_id,
28 int page_request_id, 28 int page_request_id,
29 const std::string& label, 29 const std::string& label,
30 const StreamDeviceInfoArray& audio_devices, 30 const StreamDeviceInfoArray& audio_devices,
31 const StreamDeviceInfoArray& video_devices) { 31 const StreamDeviceInfoArray& video_devices) {
32 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 32 DCHECK_CURRENTLY_ON(BrowserThread::IO);
33 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated(" 33 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated("
34 << ", {label = " << label << "})"; 34 << ", {label = " << label << "})";
35 35
36 Send(new MediaStreamMsg_StreamGenerated( 36 Send(new MediaStreamMsg_StreamGenerated(
37 render_view_id, page_request_id, label, audio_devices, 37 render_view_id, page_request_id, label, audio_devices,
38 video_devices)); 38 video_devices));
39 } 39 }
40 40
41 void MediaStreamDispatcherHost::StreamGenerationFailed( 41 void MediaStreamDispatcherHost::StreamGenerationFailed(
42 int render_view_id, 42 int render_view_id,
43 int page_request_id, 43 int page_request_id,
44 content::MediaStreamRequestResult result) { 44 content::MediaStreamRequestResult result) {
45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 45 DCHECK_CURRENTLY_ON(BrowserThread::IO);
46 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerationFailed(" 46 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerationFailed("
47 << ", {page_request_id = " << page_request_id << "}" 47 << ", {page_request_id = " << page_request_id << "}"
48 << ", { result= " << result << "})"; 48 << ", { result= " << result << "})";
49 49
50 50
51 Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id, 51 Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id,
52 page_request_id, 52 page_request_id,
53 result)); 53 result));
54 } 54 }
55 55
56 void MediaStreamDispatcherHost::DeviceStopped(int render_view_id, 56 void MediaStreamDispatcherHost::DeviceStopped(int render_view_id,
57 const std::string& label, 57 const std::string& label,
58 const StreamDeviceInfo& device) { 58 const StreamDeviceInfo& device) {
59 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 59 DCHECK_CURRENTLY_ON(BrowserThread::IO);
60 DVLOG(1) << "MediaStreamDispatcherHost::DeviceStopped(" 60 DVLOG(1) << "MediaStreamDispatcherHost::DeviceStopped("
61 << "{label = " << label << "}, " 61 << "{label = " << label << "}, "
62 << "{type = " << device.device.type << "}, " 62 << "{type = " << device.device.type << "}, "
63 << "{device_id = " << device.device.id << "})"; 63 << "{device_id = " << device.device.id << "})";
64 64
65 Send(new MediaStreamMsg_DeviceStopped(render_view_id, label, device)); 65 Send(new MediaStreamMsg_DeviceStopped(render_view_id, label, device));
66 } 66 }
67 67
68 void MediaStreamDispatcherHost::DevicesEnumerated( 68 void MediaStreamDispatcherHost::DevicesEnumerated(
69 int render_view_id, 69 int render_view_id,
70 int page_request_id, 70 int page_request_id,
71 const std::string& label, 71 const std::string& label,
72 const StreamDeviceInfoArray& devices) { 72 const StreamDeviceInfoArray& devices) {
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 73 DCHECK_CURRENTLY_ON(BrowserThread::IO);
74 DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated(" 74 DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated("
75 << ", {page_request_id = " << page_request_id << "})"; 75 << ", {page_request_id = " << page_request_id << "})";
76 76
77 Send(new MediaStreamMsg_DevicesEnumerated(render_view_id, page_request_id, 77 Send(new MediaStreamMsg_DevicesEnumerated(render_view_id, page_request_id,
78 devices)); 78 devices));
79 } 79 }
80 80
81 void MediaStreamDispatcherHost::DeviceOpened( 81 void MediaStreamDispatcherHost::DeviceOpened(
82 int render_view_id, 82 int render_view_id,
83 int page_request_id, 83 int page_request_id,
84 const std::string& label, 84 const std::string& label,
85 const StreamDeviceInfo& video_device) { 85 const StreamDeviceInfo& video_device) {
86 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 86 DCHECK_CURRENTLY_ON(BrowserThread::IO);
87 DVLOG(1) << "MediaStreamDispatcherHost::DeviceOpened(" 87 DVLOG(1) << "MediaStreamDispatcherHost::DeviceOpened("
88 << ", {page_request_id = " << page_request_id << "})"; 88 << ", {page_request_id = " << page_request_id << "})";
89 89
90 Send(new MediaStreamMsg_DeviceOpened( 90 Send(new MediaStreamMsg_DeviceOpened(
91 render_view_id, page_request_id, label, video_device)); 91 render_view_id, page_request_id, label, video_device));
92 } 92 }
93 93
94 bool MediaStreamDispatcherHost::OnMessageReceived( 94 bool MediaStreamDispatcherHost::OnMessageReceived(
95 const IPC::Message& message, bool* message_was_ok) { 95 const IPC::Message& message, bool* message_was_ok) {
96 bool handled = true; 96 bool handled = true;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( 229 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL(
230 render_process_id_, url)) { 230 render_process_id_, url)) {
231 LOG(ERROR) << "MSDH: Renderer requested a URL it's not allowed to use."; 231 LOG(ERROR) << "MSDH: Renderer requested a URL it's not allowed to use.";
232 return false; 232 return false;
233 } 233 }
234 234
235 return true; 235 return true;
236 } 236 }
237 237
238 } // namespace content 238 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698