| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 void UserMediaRequest::succeed(MediaStreamDescriptor* streamDescriptor) | 161 void UserMediaRequest::succeed(MediaStreamDescriptor* streamDescriptor) |
| 162 { | 162 { |
| 163 if (!getExecutionContext()) | 163 if (!getExecutionContext()) |
| 164 return; | 164 return; |
| 165 | 165 |
| 166 MediaStream* stream = MediaStream::create(getExecutionContext(), streamDescr
iptor); | 166 MediaStream* stream = MediaStream::create(getExecutionContext(), streamDescr
iptor); |
| 167 | 167 |
| 168 MediaStreamTrackVector audioTracks = stream->getAudioTracks(); | 168 MediaStreamTrackVector audioTracks = stream->getAudioTracks(); |
| 169 for (MediaStreamTrackVector::iterator iter = audioTracks.begin(); iter != au
dioTracks.end(); ++iter) { | 169 for (MediaStreamTrackVector::iterator iter = audioTracks.begin(); iter != au
dioTracks.end(); ++iter) { |
| 170 (*iter)->component()->source()->setConstraints(m_audio); | 170 (*iter)->component()->source()->setConstraints(m_audio); |
| 171 (*iter)->setConstraints(m_audio); |
| 171 } | 172 } |
| 172 | 173 |
| 173 MediaStreamTrackVector videoTracks = stream->getVideoTracks(); | 174 MediaStreamTrackVector videoTracks = stream->getVideoTracks(); |
| 174 for (MediaStreamTrackVector::iterator iter = videoTracks.begin(); iter != vi
deoTracks.end(); ++iter) { | 175 for (MediaStreamTrackVector::iterator iter = videoTracks.begin(); iter != vi
deoTracks.end(); ++iter) { |
| 175 (*iter)->component()->source()->setConstraints(m_video); | 176 (*iter)->component()->source()->setConstraints(m_video); |
| 177 (*iter)->setConstraints(m_video); |
| 176 } | 178 } |
| 177 | 179 |
| 178 m_successCallback->handleEvent(stream); | 180 m_successCallback->handleEvent(stream); |
| 179 } | 181 } |
| 180 | 182 |
| 181 void UserMediaRequest::failPermissionDenied(const String& message) | 183 void UserMediaRequest::failPermissionDenied(const String& message) |
| 182 { | 184 { |
| 183 if (!getExecutionContext()) | 185 if (!getExecutionContext()) |
| 184 return; | 186 return; |
| 185 m_errorCallback->handleEvent(NavigatorUserMediaError::create(NavigatorUserMe
diaError::NamePermissionDenied, message, String())); | 187 m_errorCallback->handleEvent(NavigatorUserMediaError::create(NavigatorUserMe
diaError::NamePermissionDenied, message, String())); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 213 | 215 |
| 214 DEFINE_TRACE(UserMediaRequest) | 216 DEFINE_TRACE(UserMediaRequest) |
| 215 { | 217 { |
| 216 visitor->trace(m_controller); | 218 visitor->trace(m_controller); |
| 217 visitor->trace(m_successCallback); | 219 visitor->trace(m_successCallback); |
| 218 visitor->trace(m_errorCallback); | 220 visitor->trace(m_errorCallback); |
| 219 ContextLifecycleObserver::trace(visitor); | 221 ContextLifecycleObserver::trace(visitor); |
| 220 } | 222 } |
| 221 | 223 |
| 222 } // namespace blink | 224 } // namespace blink |
| OLD | NEW |