Index: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp |
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp |
index 7a17bf6f74d7471ffb7c607d53c1c3af0198b1f7..7c4b0a718fc72e357028bebb577cac67740c1109 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp |
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp |
@@ -43,16 +43,13 @@ namespace blink { |
MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStreamComponent* component) |
{ |
- MediaStreamTrack* track = new MediaStreamTrack(context, component); |
- track->suspendIfNeeded(); |
- return track; |
+ return new MediaStreamTrack(context, component); |
} |
MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamComponent* component) |
- : ActiveDOMObject(context) |
+ : ContextLifecycleObserver(context) |
, m_readyState(MediaStreamSource::ReadyStateLive) |
, m_isIteratingRegisteredMediaStreams(false) |
- , m_stopped(false) |
, m_component(component) |
{ |
m_component->source()->addObserver(this); |
@@ -171,7 +168,7 @@ MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context) |
bool MediaStreamTrack::ended() const |
{ |
- return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); |
+ return !executionContext() || (m_readyState == MediaStreamSource::ReadyStateEnded); |
} |
void MediaStreamTrack::sourceChangedState() |
@@ -205,11 +202,6 @@ void MediaStreamTrack::propagateTrackEnded() |
m_isIteratingRegisteredMediaStreams = false; |
} |
-void MediaStreamTrack::stop() |
-{ |
- m_stopped = true; |
-} |
- |
bool MediaStreamTrack::hasPendingActivity() const |
{ |
// If 'ended' listeners exist and the object hasn't yet reached |
@@ -254,7 +246,7 @@ const AtomicString& MediaStreamTrack::interfaceName() const |
ExecutionContext* MediaStreamTrack::executionContext() const |
{ |
- return ActiveDOMObject::executionContext(); |
+ return ContextLifecycleObserver::executionContext(); |
} |
DEFINE_TRACE(MediaStreamTrack) |
@@ -262,7 +254,7 @@ DEFINE_TRACE(MediaStreamTrack) |
visitor->trace(m_registeredMediaStreams); |
visitor->trace(m_component); |
RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace(visitor); |
- ActiveDOMObject::trace(visitor); |
+ ContextLifecycleObserver::trace(visitor); |
} |
} // namespace blink |