Backed out changesets 1613eb430cec and 8ecfe45191b6 (
bug 1066812) for B2G mochitest crashes.
--- 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