From 6e457e653e5c4b2a92a2a7adc1ea6bcdc2d39a5f Mon Sep 17 00:00:00 2001
From: adeshkp <adeshkp@users.noreply.github.com>
Date: Thu, 14 Mar 2019 09:49:51 -0400
Subject: Fix a warning about method override

---
 dom/ipc/ContentChild.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dom/ipc')

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index f29d17e7f..4c8f15cc0 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -152,13 +152,13 @@ public:
   RecvInitRendering(
     Endpoint<PCompositorBridgeChild>&& aCompositor,
     Endpoint<PImageBridgeChild>&& aImageBridge,
-    Endpoint<PVideoDecoderManagerChild>&& aVideoManager);
+    Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override;
 
   bool
   RecvReinitRendering(
     Endpoint<PCompositorBridgeChild>&& aCompositor,
     Endpoint<PImageBridgeChild>&& aImageBridge,
-    Endpoint<PVideoDecoderManagerChild>&& aVideoManager);
+    Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override;
 
   PProcessHangMonitorChild*
   AllocPProcessHangMonitorChild(Transport* aTransport,
-- 
cgit v1.2.3


From 68acc67ddbbd1c7a9577498ad41d079e6b9e3eac Mon Sep 17 00:00:00 2001
From: Nika Layzell <nika@thelayzells.com>
Date: Sat, 23 Mar 2019 12:56:19 +0100
Subject: Unregister ProcessHangMonitor as a hang annotator on shutdown.

---
 dom/ipc/ProcessHangMonitor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dom/ipc')

diff --git a/dom/ipc/ProcessHangMonitor.cpp b/dom/ipc/ProcessHangMonitor.cpp
index d46a1f5d5..406d0bf0a 100644
--- a/dom/ipc/ProcessHangMonitor.cpp
+++ b/dom/ipc/ProcessHangMonitor.cpp
@@ -323,6 +323,8 @@ HangMonitorChild::Shutdown()
 {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
 
+  BackgroundHangMonitor::UnregisterAnnotator(*this);
+
   MonitorAutoLock lock(mMonitor);
   while (!mShutdownDone) {
     mMonitor.Wait();
-- 
cgit v1.2.3


From 1709b8a59ceb96f350598699d0ae8326c0bf0778 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sat, 23 Mar 2019 13:10:32 +0100
Subject: Revert "Unregister ProcessHangMonitor as a hang annotator on
 shutdown."

This reverts commit 68acc67ddbbd1c7a9577498ad41d079e6b9e3eac.
---
 dom/ipc/ProcessHangMonitor.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'dom/ipc')

diff --git a/dom/ipc/ProcessHangMonitor.cpp b/dom/ipc/ProcessHangMonitor.cpp
index 406d0bf0a..d46a1f5d5 100644
--- a/dom/ipc/ProcessHangMonitor.cpp
+++ b/dom/ipc/ProcessHangMonitor.cpp
@@ -323,8 +323,6 @@ HangMonitorChild::Shutdown()
 {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
 
-  BackgroundHangMonitor::UnregisterAnnotator(*this);
-
   MonitorAutoLock lock(mMonitor);
   while (!mShutdownDone) {
     mMonitor.Wait();
-- 
cgit v1.2.3