Merge remote-tracking branch 'origin/master' into custom

dom/media/MediaDecoderReader.h

@@ -17,6 +17,7 @@
 #include "MediaMetadataManager.h"
 #include "MediaQueue.h"
 #include "MediaTimer.h"
+#include "MP3Demuxer.h"
 #include "AudioCompactor.h"
 #include "Intervals.h"
 #include "TimeUnits.h"

dom/media/webaudio/gtest/TestAudioEventTimeline.cpp

@@ -9,17 +9,6 @@
 #include <limits>
 #include "gtest/gtest.h"
 
-// Mock the MediaStream class
-namespace mozilla {
-class MediaStream
-{
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream)
-private:
-  ~MediaStream() {
-  };
-};
-}
-
 using namespace mozilla;
 using namespace mozilla::dom;
 using std::numeric_limits;

dom/media/webspeech/moz.build

@@ -3,5 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Due to IPC entanglement we always need the synthesis ipdls
 if CONFIG['MOZ_WEBSPEECH']:
     DIRS += ['synth']
+else:
+    IPDL_SOURCES += [
+        'synth/ipc/PSpeechSynthesis.ipdl',
+        'synth/ipc/PSpeechSynthesisRequest.ipdl',
+    ]