Chromium Code Reviews| 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 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011 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 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 return; | 156 return; |
| 157 | 157 |
| 158 m_readyState = MediaStreamSource::ReadyStateEnded; | 158 m_readyState = MediaStreamSource::ReadyStateEnded; |
| 159 MediaStreamCenter::instance().didStopMediaStreamTrack(component()); | 159 MediaStreamCenter::instance().didStopMediaStreamTrack(component()); |
| 160 dispatchEvent(Event::create(EventTypeNames::ended)); | 160 dispatchEvent(Event::create(EventTypeNames::ended)); |
| 161 propagateTrackEnded(); | 161 propagateTrackEnded(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context) | 164 MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context) |
| 165 { | 165 { |
| 166 RefPtr<MediaStreamComponent> clonedComponent = MediaStreamComponent::create( component()->source()); | 166 MediaStreamComponent* clonedComponent = MediaStreamComponent::create(compone nt()->source()); |
| 167 MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComp onent.get()); | 167 MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComp onent); |
| 168 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent.get( )); | 168 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent); |
| 169 return clonedTrack; | 169 return clonedTrack; |
| 170 } | 170 } |
| 171 | 171 |
| 172 bool MediaStreamTrack::ended() const | 172 bool MediaStreamTrack::ended() const |
| 173 { | 173 { |
| 174 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); | 174 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); |
| 175 } | 175 } |
| 176 | 176 |
| 177 void MediaStreamTrack::sourceChangedState() | 177 void MediaStreamTrack::sourceChangedState() |
| 178 { | 178 { |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 200 { | 200 { |
| 201 RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams); | 201 RELEASE_ASSERT(!m_isIteratingRegisteredMediaStreams); |
| 202 m_isIteratingRegisteredMediaStreams = true; | 202 m_isIteratingRegisteredMediaStreams = true; |
| 203 for (HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStre ams.begin(); iter != m_registeredMediaStreams.end(); ++iter) | 203 for (HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStre ams.begin(); iter != m_registeredMediaStreams.end(); ++iter) |
| 204 (*iter)->trackEnded(); | 204 (*iter)->trackEnded(); |
| 205 m_isIteratingRegisteredMediaStreams = false; | 205 m_isIteratingRegisteredMediaStreams = false; |
| 206 } | 206 } |
| 207 | 207 |
| 208 MediaStreamComponent* MediaStreamTrack::component() | 208 MediaStreamComponent* MediaStreamTrack::component() |
| 209 { | 209 { |
| 210 return m_component.get(); | 210 return m_component.get(); |
|
sof
2015/09/30 06:26:34
redundant get() (and can be moved to the class dec
peria
2015/09/30 07:50:05
Done.
| |
| 211 } | 211 } |
| 212 | 212 |
| 213 void MediaStreamTrack::stop() | 213 void MediaStreamTrack::stop() |
| 214 { | 214 { |
| 215 m_stopped = true; | 215 m_stopped = true; |
| 216 } | 216 } |
| 217 | 217 |
| 218 PassOwnPtr<AudioSourceProvider> MediaStreamTrack::createWebAudioSource() | 218 PassOwnPtr<AudioSourceProvider> MediaStreamTrack::createWebAudioSource() |
| 219 { | 219 { |
| 220 return MediaStreamCenter::instance().createWebAudioSourceFromMediaStreamTrac k(component()); | 220 return MediaStreamCenter::instance().createWebAudioSourceFromMediaStreamTrac k(component()); |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 241 } | 241 } |
| 242 | 242 |
| 243 ExecutionContext* MediaStreamTrack::executionContext() const | 243 ExecutionContext* MediaStreamTrack::executionContext() const |
| 244 { | 244 { |
| 245 return ActiveDOMObject::executionContext(); | 245 return ActiveDOMObject::executionContext(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 DEFINE_TRACE(MediaStreamTrack) | 248 DEFINE_TRACE(MediaStreamTrack) |
| 249 { | 249 { |
| 250 visitor->trace(m_registeredMediaStreams); | 250 visitor->trace(m_registeredMediaStreams); |
| 251 visitor->trace(m_component); | |
| 251 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace (visitor); | 252 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace (visitor); |
| 252 ActiveDOMObject::trace(visitor); | 253 ActiveDOMObject::trace(visitor); |
| 253 } | 254 } |
| 254 | 255 |
| 255 } // namespace blink | 256 } // namespace blink |
| OLD | NEW |