Backed out changeset 9c8e3a0dbff3 (bug 1208373)

dom/media/MediaStreamTrack.cpp

@@ -350,22 +350,6 @@ MediaStreamTrack::Clone()
   return newStream->CloneDOMTrack(*this, mTrackID);
 }
 
-void
-MediaStreamTrack::NotifyEnded()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (mEnded) {
-    return;
-  }
-
-  LOG(LogLevel::Info, ("MediaStreamTrack %p ended", this));
-
-  mEnded = true;
-
-  DispatchTrustedEvent(NS_LITERAL_STRING("ended"));
-}
-
 DOMMediaStream*
 MediaStreamTrack::GetInputDOMStream()
 {

dom/media/MediaStreamTrack.h

@@ -267,18 +267,9 @@ public:
   ApplyConstraints(const dom::MediaTrackConstraints& aConstraints, ErrorResult &aRv);
   already_AddRefed<MediaStreamTrack> Clone();
 
-  IMPL_EVENT_HANDLER(ended)
-
   bool Ended() const { return mEnded; }
-
-  /**
-   * Notified by the MediaStreamGraph, through our owning MediaStream on the
-   * main thread.
-   *
-   * Note that this sets the track to ended and raises the "ended" event
-   * synchronously.
-   */
-  void NotifyEnded();
+  // Notifications from the MediaStreamGraph
+  void NotifyEnded() { mEnded = true; }
 
   /**
    * Get this track's principal.

dom/webidl/MediaStreamTrack.webidl

@@ -75,7 +75,7 @@ interface MediaStreamTrack : EventTarget {
 //  readonly    attribute boolean               _readonly;
 //  readonly    attribute boolean               remote;
 //  readonly    attribute MediaStreamTrackState readyState;
-                attribute EventHandler          onended;
+//                attribute EventHandler          onended;
     MediaStreamTrack       clone ();
     void                   stop ();
 //  MediaTrackCapabilities getCapabilities ();