From 95447e5837db07f3f76a440964c8b68c7d5c9287 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Sat, 10 Jan 2015 13:46:46 -0500
Subject: [PATCH] Bug 1103036 - Don't send shutdown message to Nuwa processes;
 r=billm

---
 dom/ipc/ContentParent.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index ef2a7b1a8375..0c22b7e4deb5 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1500,6 +1500,14 @@ ContentParent::TransformPreallocatedIntoBrowser(ContentParent* aOpener)
 void
 ContentParent::ShutDownProcess(ShutDownMethod aMethod)
 {
+#ifdef MOZ_NUWA_PROCESS
+    if (aMethod == SEND_SHUTDOWN_MESSAGE && IsNuwaProcess()) {
+        // We shouldn't send shutdown messages to frozen Nuwa processes,
+        // so just close the channel.
+        aMethod = CLOSE_CHANNEL;
+    }
+#endif
+
     // Shutting down by sending a shutdown message works differently than the
     // other methods. We first call Shutdown() in the child. After the child is
     // ready, it calls FinishShutdown() on us. Then we close the channel.