| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011, 2012 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND | 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND |
| 15 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR |
| 18 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 18 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
| 20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
| 21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
| 22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "modules/mediastream/MediaStream.h" | 26 #include "modules/mediastream/MediaStream.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ExceptionState.h" | 28 #include "bindings/core/v8/ExceptionState.h" |
| 29 #include "bindings/core/v8/ScriptState.h" |
| 29 #include "core/dom/ExceptionCode.h" | 30 #include "core/dom/ExceptionCode.h" |
| 31 #include "core/dom/ExecutionContext.h" |
| 30 #include "core/dom/TaskRunnerHelper.h" | 32 #include "core/dom/TaskRunnerHelper.h" |
| 31 #include "core/frame/Deprecation.h" | 33 #include "core/frame/Deprecation.h" |
| 32 #include "modules/mediastream/MediaStreamRegistry.h" | 34 #include "modules/mediastream/MediaStreamRegistry.h" |
| 33 #include "modules/mediastream/MediaStreamTrackEvent.h" | 35 #include "modules/mediastream/MediaStreamTrackEvent.h" |
| 34 #include "platform/mediastream/MediaStreamCenter.h" | 36 #include "platform/mediastream/MediaStreamCenter.h" |
| 35 #include "platform/mediastream/MediaStreamSource.h" | 37 #include "platform/mediastream/MediaStreamSource.h" |
| 36 | 38 |
| 37 namespace blink { | 39 namespace blink { |
| 38 | 40 |
| 39 static bool containsSource(MediaStreamTrackVector& trackVector, | 41 static bool containsSource(MediaStreamTrackVector& trackVector, |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 269 |
| 268 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); | 270 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); |
| 269 iter != m_videoTracks.end(); ++iter) { | 271 iter != m_videoTracks.end(); ++iter) { |
| 270 if ((*iter)->id() == id) | 272 if ((*iter)->id() == id) |
| 271 return iter->get(); | 273 return iter->get(); |
| 272 } | 274 } |
| 273 | 275 |
| 274 return 0; | 276 return 0; |
| 275 } | 277 } |
| 276 | 278 |
| 277 MediaStream* MediaStream::clone(ExecutionContext* context) { | 279 MediaStream* MediaStream::clone(ScriptState* scriptState) { |
| 278 MediaStreamTrackVector tracks; | 280 MediaStreamTrackVector tracks; |
| 281 ExecutionContext* context = scriptState->getExecutionContext(); |
| 279 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); | 282 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); |
| 280 iter != m_audioTracks.end(); ++iter) | 283 iter != m_audioTracks.end(); ++iter) |
| 281 tracks.push_back((*iter)->clone(context)); | 284 tracks.push_back((*iter)->clone(scriptState)); |
| 282 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); | 285 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); |
| 283 iter != m_videoTracks.end(); ++iter) | 286 iter != m_videoTracks.end(); ++iter) |
| 284 tracks.push_back((*iter)->clone(context)); | 287 tracks.push_back((*iter)->clone(scriptState)); |
| 285 return MediaStream::create(context, tracks); | 288 return MediaStream::create(context, tracks); |
| 286 } | 289 } |
| 287 | 290 |
| 288 void MediaStream::trackEnded() { | 291 void MediaStream::trackEnded() { |
| 289 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); | 292 for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); |
| 290 iter != m_audioTracks.end(); ++iter) { | 293 iter != m_audioTracks.end(); ++iter) { |
| 291 if (!(*iter)->ended()) | 294 if (!(*iter)->ended()) |
| 292 return; | 295 return; |
| 293 } | 296 } |
| 294 | 297 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 EventTargetWithInlineData::trace(visitor); | 430 EventTargetWithInlineData::trace(visitor); |
| 428 ContextClient::trace(visitor); | 431 ContextClient::trace(visitor); |
| 429 MediaStreamDescriptorClient::trace(visitor); | 432 MediaStreamDescriptorClient::trace(visitor); |
| 430 } | 433 } |
| 431 | 434 |
| 432 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor) { | 435 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor) { |
| 433 return static_cast<MediaStream*>(descriptor->client()); | 436 return static_cast<MediaStream*>(descriptor->client()); |
| 434 } | 437 } |
| 435 | 438 |
| 436 } // namespace blink | 439 } // namespace blink |
| OLD | NEW |