Bug 1320994 - Unify MediaManager logging macros. r?jib draft
authorAndreas Pehrson <pehrsons@gmail.com>
Wed, 29 Mar 2017 12:06:49 +0200
changeset 572751 f15c16b361171603783ce0b5f1defd128a89144c
parent 572750 aaee13c926fe82ca010168557624912571292a8f
child 572752 d75e8a06f467d347492b0c0de86568d3160567f7
push id57178
push userbmo:pehrson@telenordigital.com
push dateThu, 04 May 2017 17:44:26 +0000
reviewersjib
bugs1320994
milestone55.0a1
Bug 1320994 - Unify MediaManager logging macros. r?jib MozReview-Commit-ID: 14b6cXgOqP8
dom/media/MediaManager.cpp
dom/media/MediaManager.h
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1272,17 +1272,17 @@ public:
       }
 
       // Start() queued the tracks to be added synchronously to avoid races
       source->FinishAddTracks();
 
       source->SetPullEnabled(true);
       source->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
-      MM_LOG(("started all sources"));
+      LOG(("started all sources"));
 
       // Forward onTracksAvailableCallback to GetUserMediaNotificationEvent,
       // because onTracksAvailableCallback needs to be added to domStream
       // on the main thread.
       // The event runnable must always be released on mainthread due to the JS
       // callbacks in the TracksAvailableCallback.
       NS_DispatchToMainThread(do_AddRef(
         new GetUserMediaNotificationEvent(
@@ -3444,17 +3444,17 @@ SourceListener::Stop()
 void
 SourceListener::Remove()
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mStream || mRemoved) {
     return;
   }
 
-  MM_LOG(("SourceListener removed on purpose, mFinished = %d", (int) mFinished));
+  LOG(("SourceListener removed on purpose, mFinished = %d", (int) mFinished));
   mRemoved = true; // RemoveListener is async, avoid races
   mWindowListener = nullptr;
 
   // If it's destroyed, don't call - listener will be removed and we'll be notified!
   if (!mStream->IsDestroyed()) {
     mStream->RemoveListener(this);
   }
 }
@@ -3657,17 +3657,17 @@ SourceListener::NotifyFinished()
   Stop(); // we know it's been activated
   mWindowListener->Remove(this);
 }
 
 void
 SourceListener::NotifyRemoved()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MM_LOG(("SourceListener removed, mFinished = %d", (int) mFinished));
+  LOG(("SourceListener removed, mFinished = %d", (int) mFinished));
   mRemoved = true;
 
   if (!mFinished) {
     NotifyFinished();
   }
 
   mWindowListener = nullptr;
 }
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -55,19 +55,16 @@ namespace ipc {
 class PrincipalInfo;
 }
 
 class GetUserMediaTask;
 class GetUserMediaWindowListener;
 class MediaManager;
 class SourceListener;
 
-extern LogModule* GetMediaManagerLog();
-#define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
-
 class MediaDevice : public nsIMediaDevice
 {
 public:
   typedef MediaEngineSource Source;
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIMEDIADEVICE