diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 1560e0fd9db4..4f3d5b020aea 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1799,11 +1799,5 @@ pref("extensions.interposition.prefetching", true);
pref("browser.defaultbrowser.notificationbar", false);
-// How often to check for CPOW timeouts. CPOWs are only timed out by
-// the hang monitor.
-pref("dom.ipc.cpow.timeout", 500);
-
-// Enable e10s hang monitoring (slow script checking and plugin hang
-// detection).
-pref("dom.ipc.processHangMonitor", true);
-pref("dom.ipc.reportProcessHangs", true);
+// How many milliseconds to wait for a CPOW response from the child process.
+pref("dom.ipc.cpow.timeout", 0);
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1c3d10b95758..1272d131ded4 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -149,9 +149,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Social",
XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
"resource://gre/modules/PageThumbs.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ProcessHangMonitor",
- "resource:///modules/ProcessHangMonitor.jsm");
-
#ifdef MOZ_SAFE_BROWSING
XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
"resource://gre/modules/SafeBrowsing.jsm");
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 8afeecd913ba..a42f415bf87b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -334,26 +334,6 @@
orient="horizontal"
hidden="true"/>
-
-
-
-
-
-
-
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index ef5dfadc0f57..b42968106896 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -59,9 +59,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "CustomizationTabPreloader",
XPCOMUtils.defineLazyModuleGetter(this, "PdfJs",
"resource://pdf.js/PdfJs.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ProcessHangMonitor",
- "resource:///modules/ProcessHangMonitor.jsm");
-
#ifdef NIGHTLY_BUILD
XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
"resource://shumway/ShumwayUtils.jsm");
@@ -763,8 +760,6 @@ BrowserGlue.prototype = {
}
#endif
- ProcessHangMonitor.init();
-
// A channel for "remote troubleshooting" code...
let channel = new WebChannel("remote-troubleshooting", "remote-troubleshooting");
channel.listen((id, data, target) => {
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
index 2db3bbfd3a9a..968aefcf2eef 100644
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -854,9 +854,17 @@ let gDevToolsBrowser = {
.getService(Ci.nsISlowScriptDebug);
let tm = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
- function slowScriptDebugHandler(aTab, aCallback) {
- let target = devtools.TargetFactory.forTab(aTab);
+ debugService.activationHandler = function(aWindow) {
+ let chromeWindow = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIWebNavigation)
+ .QueryInterface(Ci.nsIDocShellTreeItem)
+ .rootTreeItem
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIDOMWindow)
+ .QueryInterface(Ci.nsIDOMChromeWindow);
+ let target = devtools.TargetFactory.forTab(chromeWindow.gBrowser.selectedTab);
+ let setupFinished = false;
gDevTools.showToolbox(target, "jsdebugger").then(toolbox => {
let threadClient = toolbox.getCurrentPanel().panelWin.gThreadClient;
@@ -866,13 +874,13 @@ let gDevToolsBrowser = {
case "paused":
// When the debugger is already paused.
threadClient.breakOnNext();
- aCallback();
+ setupFinished = true;
break;
case "attached":
// When the debugger is already open.
threadClient.interrupt(() => {
threadClient.breakOnNext();
- aCallback();
+ setupFinished = true;
});
break;
case "resuming":
@@ -880,7 +888,7 @@ let gDevToolsBrowser = {
threadClient.addOneTimeListener("resumed", () => {
threadClient.interrupt(() => {
threadClient.breakOnNext();
- aCallback();
+ setupFinished = true;
});
});
break;
@@ -889,20 +897,6 @@ let gDevToolsBrowser = {
threadClient.state);
}
});
- }
-
- debugService.activationHandler = function(aWindow) {
- let chromeWindow = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShellTreeItem)
- .rootTreeItem
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindow)
- .QueryInterface(Ci.nsIDOMChromeWindow);
-
- let setupFinished = false;
- slowScriptDebugHandler(chromeWindow.gBrowser.selectedTab,
- () => { setupFinished = true; });
// Don't return from the interrupt handler until the debugger is brought
// up; no reason to continue executing the slow script.
@@ -914,18 +908,6 @@ let gDevToolsBrowser = {
}
utils.leaveModalState();
};
-
- debugService.remoteActivationHandler = function(aBrowser, aCallback) {
- let chromeWindow = aBrowser.ownerDocument.defaultView;
- let tab = chromeWindow.gBrowser.getTabForBrowser(aBrowser);
- chromeWindow.gBrowser.selected = tab;
-
- function callback() {
- aCallback.finishDebuggerStartup();
- }
-
- slowScriptDebugHandler(tab, callback);
- };
},
/**
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 0553b443f669..5ed0a3ea5370 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -831,11 +831,3 @@ just addresses the organization to follow, e.g. "This site is run by " -->
-
-
-
-
-
-
-
-
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 77f669108c1d..8e37b09fa73c 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -435,11 +435,6 @@ dataReportingNotification.message = %1$S automatically sends some data to
dataReportingNotification.button.label = Choose What I Share
dataReportingNotification.button.accessKey = C
-# Process hang reporter
-processHang.message = A web page is causing %1$S to run slowly. What would you like to do?
-processHang.button.label = Options
-processHang.button.accessKey = O
-
# Webapps notification popup
webapps.install = Install
webapps.install.accesskey = I
diff --git a/browser/modules/ProcessHangMonitor.jsm b/browser/modules/ProcessHangMonitor.jsm
deleted file mode 100644
index 6213e11febdb..000000000000
--- a/browser/modules/ProcessHangMonitor.jsm
+++ /dev/null
@@ -1,309 +0,0 @@
-/* -*- mode: js; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-
-this.EXPORTED_SYMBOLS = ["ProcessHangMonitor"];
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-/**
- * This JSM is responsible for observing content process hang reports
- * and asking the user what to do about them. See nsIHangReport for
- * the platform interface.
- */
-
-/**
- * If a hang hasn't been reported for more than 5 seconds, assume the
- * content process has gotten unstuck (and hide the hang notification).
- */
-const HANG_EXPIRATION_TIME = 5000;
-
-let ProcessHangMonitor = {
- /**
- * Collection of hang reports that haven't expired or been dismissed
- * by the user. The keys are nsIHangReports and values keys are
- * timers. Each time the hang is reported, the timer is refreshed so
- * it expires after HANG_EXPIRATION_TIME.
- */
- _activeReports: new Map(),
-
- /**
- * Initialize hang reporting. Called once in the parent process.
- */
- init: function() {
- Services.obs.addObserver(this, "process-hang-report", false);
- Services.obs.addObserver(this, "xpcom-shutdown", false);
- Services.ww.registerNotification(this);
- },
-
- /**
- * Terminate JavaScript associated with the hang being reported for
- * the selected browser in |win|.
- */
- terminateScript: function(win) {
- this.handleUserInput(win, report => report.terminateScript());
- },
-
- /**
- * Start devtools debugger for JavaScript associated with the hang
- * being reported for the selected browser in |win|.
- */
- debugScript: function(win) {
- this.handleUserInput(win, report => {
- function callback() {
- report.endStartingDebugger();
- }
-
- report.beginStartingDebugger();
-
- let svc = Cc["@mozilla.org/dom/slow-script-debug;1"].getService(Ci.nsISlowScriptDebug);
- let handler = svc.remoteActivationHandler;
- handler.handleSlowScriptDebug(report.scriptBrowser, callback);
- });
- },
-
- /**
- * Kill the plugin process causing the hang being reported for the
- * selected browser in |win|.
- */
- terminatePlugin: function(win) {
- this.handleUserInput(win, report => report.terminatePlugin());
- },
-
- /**
- * Kill the content process causing the hang being reported for the selected
- * browser in |win|.
- */
- terminateProcess: function(win) {
- this.handleUserInput(win, report => report.terminateProcess());
- },
-
- /**
- * Update the "Options" pop-up menu for the hang notification
- * associated with the selected browser in |win|. The menu should
- * display only options that are relevant to the given report.
- */
- refreshMenu: function(win) {
- let report = this.findReport(win.gBrowser.selectedBrowser);
- if (!report) {
- return;
- }
-
- function setVisible(id, visible) {
- let item = win.document.getElementById(id);
- item.hidden = !visible;
- }
-
- if (report.hangType == report.SLOW_SCRIPT) {
- setVisible("processHangTerminateScript", true);
- setVisible("processHangDebugScript", true);
- setVisible("processHangTerminatePlugin", false);
- } else if (report.hangType == report.PLUGIN_HANG) {
- setVisible("processHangTerminateScript", false);
- setVisible("processHangDebugScript", false);
- setVisible("processHangTerminatePlugin", true);
- }
- },
-
- /**
- * If there is a hang report associated with the selected browser in
- * |win|, invoke |func| on that report and stop notifying the user
- * about it.
- */
- handleUserInput: function(win, func) {
- let report = this.findReport(win.gBrowser.selectedBrowser);
- if (!report) {
- return;
- }
- this.removeReport(report);
-
- return func(report);
- },
-
- observe: function(subject, topic, data) {
- switch (topic) {
- case "xpcom-shutdown":
- Services.obs.removeObserver(this, "xpcom-shutdown");
- Services.obs.removeObserver(this, "process-hang-report");
- Services.ww.unregisterNotification(this);
- break;
-
- case "process-hang-report":
- this.reportHang(subject.QueryInterface(Ci.nsIHangReport));
- break;
-
- case "domwindowopened":
- // Install event listeners on the new window in case one of
- // its tabs is already hung.
- let win = subject.QueryInterface(Ci.nsIDOMWindow);
- let listener = (ev) => {
- win.removeEventListener("load", listener, true);
- this.updateWindows();
- };
- win.addEventListener("load", listener, true);
- break;
- }
- },
-
- /**
- * Find any active hang reports for the given