merge mozilla-central to mozilla-inbound. CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 31 Jan 2018 21:31:53 +0200
changeset 401794 94d801165c4561d416204a78928c65ff79b3f0d9
parent 401792 86d833310227b6d5590fc361adb5e88f9b4310d7 (current diff)
parent 401793 a8cafd4e34a16f257bc59e991c2cdf9c570b395f (diff)
child 401795 97243b78d51279f0fde3053ed02a3943526136b3
push id99438
push userarchaeopteryx@coole-files.de
push dateWed, 31 Jan 2018 19:32:11 +0000
treeherdermozilla-inbound@94d801165c45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge mozilla-central to mozilla-inbound. CLOSED TREE
--- a/dom/media/webrtc/MediaEngineSource.cpp
+++ b/dom/media/webrtc/MediaEngineSource.cpp
@@ -4,24 +4,27 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaEngineSource.h"
 
 #include "mozilla/dom/MediaTrackSettingsBinding.h"
 
 namespace mozilla {
 
+using dom::MediaSourceEnum;
+using dom::MediaTrackSettings;
+
 // These need a definition somewhere because template
 // code is allowed to take their address, and they aren't
 // guaranteed to have one without this.
 const unsigned int MediaEngineSource::kMaxDeviceNameLength;
 const unsigned int MediaEngineSource::kMaxUniqueIdLength;
 
 /* static */ bool
-MediaEngineSource::IsVideo(dom::MediaSourceEnum aSource)
+MediaEngineSource::IsVideo(MediaSourceEnum aSource)
 {
   switch (aSource) {
     case MediaSourceEnum::Camera:
     case MediaSourceEnum::Screen:
     case MediaSourceEnum::Application:
     case MediaSourceEnum::Window:
     case MediaSourceEnum::Browser:
       return true;
@@ -59,17 +62,17 @@ MediaEngineSource::Shutdown()
 
 nsresult
 MediaEngineSource::TakePhoto(MediaEnginePhotoCallback* aCallback)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 void
-MediaEngineSource::GetSettings(dom::MediaTrackSettings& aOutSettings) const
+MediaEngineSource::GetSettings(MediaTrackSettings& aOutSettings) const
 {
-  dom::MediaTrackSettings empty;
+  MediaTrackSettings empty;
   aOutSettings = empty;
 }
 
 MediaEngineSource::~MediaEngineSource() = default;
 
 } // namespace mozilla
--- a/dom/media/webrtc/MediaTrackConstraints.cpp
+++ b/dom/media/webrtc/MediaTrackConstraints.cpp
@@ -5,19 +5,19 @@
 
 #include "MediaTrackConstraints.h"
 
 #include <limits>
 #include <algorithm>
 #include <iterator>
 
 #include "MediaEngineSource.h"
-#include "MediaManager.h"
 #include "nsIScriptError.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
+#include "mozilla/MediaManager.h"
 
 namespace mozilla {
 
 using dom::ConstrainBooleanParameters;
 using dom::OwningLongOrConstrainLongRange;
 
 template<class ValueType>
 template<class ConstrainRange>