MediaStreamTrack now has it's own readyState.

Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 29 matching lines @@
 
 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ExecutionContext* context, MediaStreamComponent* component)
 {
     RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, component));
     track->suspendIfNeeded();
     return track.release();
 }
 
 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamComponent* component)
     : ActiveDOMObject(context)
+    , m_readyState(MediaStreamSource::ReadyStateLive)
     , m_isIteratingObservers(false)
     , m_stopped(false)
     , m_component(component)
 {
     ScriptWrappable::init(this);
     m_component->source()->addObserver(this);
 }
 
 MediaStreamTrack::~MediaStreamTrack()
 {
@@ skipping 26 matching lines @@
     return m_component->source()->name();
 }
 
 bool MediaStreamTrack::enabled() const
 {
     return m_component->enabled();
 }
 
 void MediaStreamTrack::setEnabled(bool enabled)
 {
-    if (m_stopped || enabled == m_component->enabled())
+    if (enabled == m_component->enabled())
         return;
 
     m_component->setEnabled(enabled);
 
-    MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_component.get());
+    if (!ended())
+        MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_component.get());
 }
 
 String MediaStreamTrack::readyState() const
 {
-    if (m_stopped)
+    if (ended())
         return "ended";
 
-    switch (m_component->source()->readyState()) {
+    switch (m_readyState) {
     case MediaStreamSource::ReadyStateLive:
         return "live";
     case MediaStreamSource::ReadyStateMuted:
         return "muted";
     case MediaStreamSource::ReadyStateEnded:
         return "ended";
     }
 
     ASSERT_NOT_REACHED();
     return String();
 }
 
 void MediaStreamTrack::getSources(ExecutionContext* context, PassOwnPtr<MediaStreamTrackSourcesCallback> callback, ExceptionState& exceptionState)
 {
     RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequestImpl::create(context->securityOrigin()->toString(), callback);
     if (!MediaStreamCenter::instance().getMediaStreamTrackSources(request.release()))
         exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::failedToExecute("getSources", "MediaStreamTrack", "Functionality not implemented yet"));
 }
 
 void MediaStreamTrack::stopTrack(ExceptionState& exceptionState)
 {
     if (ended())
         return;
 
+    m_readyState = MediaStreamSource::ReadyStateEnded;
     MediaStreamCenter::instance().didStopMediaStreamTrack(component());
+    dispatchEvent(Event::create(EventTypeNames::ended));
+    propagateTrackEnded();
 }
 
 PassRefPtr<MediaStreamTrack> MediaStreamTrack::clone(ExecutionContext* context)
 {
     RefPtr<MediaStreamComponent> clonedComponent = MediaStreamComponent::create(component()->source());
     RefPtr<MediaStreamTrack> clonedTrack = MediaStreamTrack::create(context, clonedComponent.get());
     MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent.get());
     return clonedTrack.release();
 }
 
 bool MediaStreamTrack::ended() const
 {
-    return m_stopped || (m_component->source()->readyState() == MediaStreamSource::ReadyStateEnded);
+    return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState()
 {
-    if (m_stopped)
+    if (ended())
         return;
 
-    switch (m_component->source()->readyState()) {
+    m_readyState = m_component->source()->readyState();
+    switch (m_readyState) {
     case MediaStreamSource::ReadyStateLive:
         dispatchEvent(Event::create(EventTypeNames::unmute));
         break;
     case MediaStreamSource::ReadyStateMuted:
         dispatchEvent(Event::create(EventTypeNames::mute));
         break;
     case MediaStreamSource::ReadyStateEnded:
         dispatchEvent(Event::create(EventTypeNames::ended));
         propagateTrackEnded();
         break;
@@ skipping 42 matching lines @@
 {
     return EventTargetNames::MediaStreamTrack;
 }
 
 ExecutionContext* MediaStreamTrack::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
 } // namespace WebCore