Backed out 2 changesets (bug 1324548) for Mochitest failures in dom/t…

…ests/mochitest/general/test_interfaces.html. CLOSED TREE Backed out changeset fda93e03e469 (bug 1324548) Backed out changeset 8e6135544e33 (bug 1324548)
dothq · Apr 3, 2019 · 47b5923 · 47b5923
1 parent e7f0391
commit 47b5923
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 538 deletions.
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
@@ -105,8 +105,6 @@ MediaDecodeAudioDataNoAudio=The buffer passed to decodeAudioData does not contai
 MediaElementAudioSourceNodeCrossOrigin=The HTMLMediaElement passed to createMediaElementSource has a cross-origin resource, the node will output silence.
 # LOCALIZATION NOTE: Do not translate MediaStream and createMediaStreamSource.
 MediaStreamAudioSourceNodeCrossOrigin=The MediaStream passed to createMediaStreamSource has a cross-origin resource, the node will output silence.
-# LOCALIZATION NOTE : Do not translate MediaStreamTrack and createMediaStreamTrackSource.
-MediaStreamTrackAudioSourceNodeCrossOrigin=The MediaStreamTrack passed to createMediaStreamTrackSource is a cross-origin resource, the node will output silence.
 # LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaElementAudioCaptureOfMediaStreamError=The captured HTMLMediaElement is playing a MediaStream. Applying volume or mute status is not currently supported.
 MediaLoadExhaustedCandidates=All candidate resources failed to load. Media load paused.

diff --git a/dom/media/MediaStreamTrack.cpp b/dom/media/MediaStreamTrack.cpp
@@ -112,10 +112,6 @@ class MediaStreamTrack::MSGListener : public MediaStreamTrackListener {
     mGraph->DispatchToMainThreadStableState(
         NS_NewRunnableFunction("MediaStreamTrack::MSGListener::mTrackReleaser",
                                [self = RefPtr<MSGListener>(this)]() {}));
-
-    mGraph->Dispatch(NS_NewRunnableFunction(
-        "MediaStreamTrack::MSGListener::DoNotifyEnded",
-        [self = RefPtr<MSGListener>(this)]() { self->DoNotifyEnded(); }));
   }
 
   void DoNotifyEnded() {

diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
@@ -31,7 +31,6 @@
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
 #include "mozilla/dom/MediaStreamAudioSourceNodeBinding.h"
-#include "mozilla/dom/MediaStreamTrackAudioSourceNodeBinding.h"
 #include "mozilla/dom/OfflineAudioContextBinding.h"
 #include "mozilla/dom/OscillatorNodeBinding.h"
 #include "mozilla/dom/PannerNodeBinding.h"
@@ -63,7 +62,6 @@
 #include "MediaElementAudioSourceNode.h"
 #include "MediaStreamAudioDestinationNode.h"
 #include "MediaStreamAudioSourceNode.h"
-#include "MediaStreamTrackAudioSourceNode.h"
 #include "MediaStreamGraph.h"
 #include "nsContentUtils.h"
 #include "nsIScriptError.h"
@@ -426,15 +424,6 @@ AudioContext::CreateMediaStreamSource(DOMMediaStream& aMediaStream,
   return MediaStreamAudioSourceNode::Create(*this, options, aRv);
 }
 
-already_AddRefed<MediaStreamTrackAudioSourceNode>
-AudioContext::CreateMediaStreamTrackSource(MediaStreamTrack& aMediaStreamTrack,
-                                           ErrorResult& aRv) {
-  MediaStreamTrackAudioSourceOptions options;
-  options.mMediaStreamTrack = aMediaStreamTrack;
-
-  return MediaStreamTrackAudioSourceNode::Create(*this, options, aRv);
-}
-
 already_AddRefed<GainNode> AudioContext::CreateGain(ErrorResult& aRv) {
   return GainNode::Create(*this, GainOptions(), aRv);
 }

diff --git a/dom/media/webaudio/AudioContext.h b/dom/media/webaudio/AudioContext.h
@@ -67,8 +67,6 @@ class IIRFilterNode;
 class MediaElementAudioSourceNode;
 class MediaStreamAudioDestinationNode;
 class MediaStreamAudioSourceNode;
-class MediaStreamTrack;
-class MediaStreamTrackAudioSourceNode;
 class OscillatorNode;
 class PannerNode;
 class ScriptProcessorNode;
@@ -248,9 +246,6 @@ class AudioContext final : public DOMEventTargetHelper,
       HTMLMediaElement& aMediaElement, ErrorResult& aRv);
   already_AddRefed<MediaStreamAudioSourceNode> CreateMediaStreamSource(
       DOMMediaStream& aMediaStream, ErrorResult& aRv);
-  already_AddRefed<MediaStreamTrackAudioSourceNode>
-  CreateMediaStreamTrackSource(MediaStreamTrack& aMediaStreamTrack,
-                               ErrorResult& aRv);
 
   already_AddRefed<DelayNode> CreateDelay(double aMaxDelayTime,
                                           ErrorResult& aRv);

diff --git a/dom/media/webaudio/MediaStreamTrackAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamTrackAudioSourceNode.cpp
diff --git a/dom/media/webaudio/MediaStreamTrackAudioSourceNode.h b/dom/media/webaudio/MediaStreamTrackAudioSourceNode.h
diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build
@@ -66,7 +66,6 @@ EXPORTS.mozilla.dom += [
     'MediaElementAudioSourceNode.h',
     'MediaStreamAudioDestinationNode.h',
     'MediaStreamAudioSourceNode.h',
-    'MediaStreamTrackAudioSourceNode.h',
     'OscillatorNode.h',
     'PannerNode.h',
     'PeriodicWave.h',
@@ -111,7 +110,6 @@ UNIFIED_SOURCES += [
     'MediaElementAudioSourceNode.cpp',
     'MediaStreamAudioDestinationNode.cpp',
     'MediaStreamAudioSourceNode.cpp',
-    'MediaStreamTrackAudioSourceNode.cpp',
     'OscillatorNode.cpp',
     'PannerNode.cpp',
     'PeriodicWave.cpp',