Backed out changesets 1613eb430cec and 8ecfe45191b6 (bug 1066812) for B2G mochitest crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 09 Feb 2015 15:49:55 -0500
changeset 241769 0207e9b9ae79f96809206fb7cda13396b522f2e5
parent 241768 b0c804005c809bd4e0773d0c8366a70e662732fa
child 241770 3b25c782402cd292f410c9e0e7c891f242a9300b
push id619
push usercliu@mozilla.com
push dateMon, 09 Feb 2015 21:57:21 +0000
bugs1066812
milestone38.0a1
backs out1613eb430ceca58105bb46fa18eb0731889ae7a3
8ecfe45191b6006125d0756967ed6e1a7ab16258
Backed out changesets 1613eb430cec and 8ecfe45191b6 (bug 1066812) for B2G mochitest crashes.
dom/ipc/ContentChild.cpp
ipc/glue/MessageChannel.h
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -602,19 +602,16 @@ ContentChild::Init(MessageLoop* aIOLoop,
     if (!Open(aChannel, aParentHandle, aIOLoop)) {
       return false;
     }
     sSingleton = this;
 
     // Make sure there's an nsAutoScriptBlocker on the stack when dispatching
     // urgent messages.
     GetIPCChannel()->BlockScripts();
-    // If communications with the parent have broken down, take the process
-    // down so it's not hanging around.
-    GetIPCChannel()->SetAbortOnError(true);
 
 #ifdef MOZ_X11
     // Send the parent our X socket to act as a proxy reference for our X
     // resources.
     int xSocketFd = ConnectionNumber(DefaultXDisplay());
     SendBackUpXResources(FileDescriptor(xSocketFd));
 #endif
 
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -83,17 +83,17 @@ class MessageChannel : HasResultCodes
     // Force the channel to behave as if a channel error occurred. Valid
     // for process links only, not thread links.
     void CloseWithError();
 
     void CloseWithTimeout();
 
     void SetAbortOnError(bool abort)
     {
-        mAbortOnError = abort;
+        mAbortOnError = true;
     }
 
     // Misc. behavioral traits consumers can request for this channel
     enum ChannelFlags {
       REQUIRE_DEFAULT                         = 0,
       // Windows: if this channel operates on the UI thread, indicates
       // WindowsMessageLoop code should enable deferred native message
       // handling to prevent deadlocks. Should only be used for protocols