Backed out 15 changesets (bug 1014393) for causing test_mediarecorder…

…_record_gum_video_timeslice_mixed.html a=backout Backed out changeset 83a1758bc6fa (bug 1014393) Backed out changeset be1f1f82f92c (bug 1014393) Backed out changeset 21ec9e104912 (bug 1014393) Backed out changeset ea6314a61a77 (bug 1014393) Backed out changeset e35a1a354bb5 (bug 1014393) Backed out changeset 5c4b5620be2e (bug 1014393) Backed out changeset 579d7f15d4f2 (bug 1014393) Backed out changeset f9a9b2fc3335 (bug 1014393) Backed out changeset c49241bad727 (bug 1014393) Backed out changeset fc24872739e4 (bug 1014393) Backed out changeset fd846ac16731 (bug 1014393) Backed out changeset 4b11f19aa613 (bug 1014393) Backed out changeset 4a57b865b461 (bug 1014393) Backed out changeset 147d5aeaab46 (bug 1014393) Backed out changeset c58e17df9c99 (bug 1014393)
iaxat · Aug 3, 2019 · 94a684e · 94a684e
1 parent 84e554d
commit 94a684e
Show file tree

Hide file tree

Showing 40 changed files with 1,015 additions and 1,381 deletions.
diff --git a/dom/file/Blob.cpp b/dom/file/Blob.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Blob.h"
-#include "EmptyBlobImpl.h"
 #include "File.h"
 #include "MemoryBlobImpl.h"
 #include "mozilla/dom/BlobBinding.h"
@@ -73,14 +72,6 @@ Blob* Blob::Create(nsISupports* aParent, BlobImpl* aImpl) {
   return aImpl->IsFile() ? new File(aParent, aImpl) : new Blob(aParent, aImpl);
 }
 
-/* static */
-already_AddRefed<Blob> Blob::CreateEmptyBlob(nsISupports* aParent,
-                                             const nsAString& aContentType) {
-  RefPtr<Blob> blob = Blob::Create(aParent, new EmptyBlobImpl(aContentType));
-  MOZ_ASSERT(!blob->mImpl->IsFile());
-  return blob.forget();
-}
-
 /* static */
 already_AddRefed<Blob> Blob::CreateStringBlob(nsISupports* aParent,
                                               const nsACString& aData,

diff --git a/dom/file/Blob.h b/dom/file/Blob.h
@@ -50,9 +50,6 @@ class Blob : public nsIMutable,
   // This creates a Blob or a File based on the type of BlobImpl.
   static Blob* Create(nsISupports* aParent, BlobImpl* aImpl);
 
-  static already_AddRefed<Blob> CreateEmptyBlob(nsISupports* aParent,
-                                                const nsAString& aContentType);
-
   static already_AddRefed<Blob> CreateStringBlob(nsISupports* aParent,
                                                  const nsACString& aData,
                                                  const nsAString& aContentType);

diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
@@ -3018,5 +3018,3 @@ void MediaFormatReader::OnFirstDemuxFailed(TrackInfo::TrackType aType,
 }  // namespace mozilla
 
 #undef NS_DispatchToMainThread
-#undef LOGV
-#undef LOG
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
@@ -172,6 +172,10 @@ class nsMainThreadPtrHolder<
 
 namespace mozilla {
 
+#ifdef LOG
+#  undef LOG
+#endif
+
 LazyLogModule gMediaManagerLog("MediaManager");
 #define LOG(...) MOZ_LOG(gMediaManagerLog, LogLevel::Debug, (__VA_ARGS__))
 
@@ -4615,6 +4619,4 @@ void GetUserMediaWindowListener::NotifyChrome() {
       }));
 }
 
-#undef LOG
-
 }  // namespace mozilla