Bug 1356334: Part 6 - Allow completely terminating a slow content script sandbox. r=billm
authorKris Maglione <maglione.k@gmail.com>
Sun, 16 Apr 2017 14:01:16 -0700
changeset 6750 50bc5a837cfe2a880ada438cf2f70b9096c817b1
parent 6749 884deff5ae26ea83f1909394677655d2da698e0b
child 6751 600a3bc43ccfbea128ab5fb3a21e0f9d019263d6
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersbillm
bugs1356334
Bug 1356334: Part 6 - Allow completely terminating a slow content script sandbox. r=billm MozReview-Commit-ID: 5CDLHrAeuDt X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 6f57bca8977c2106570607f76c69a68ffae8f52b
browser/chrome/browser/browser.properties
dom/chrome/dom/dom.properties
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -588,16 +588,18 @@ dataReportingNotification.button.accessK
 processHang.label = A web page is slowing down your browser. What would you like to do?
 # LOCALIZATION NOTE (processHang.add-on.label): The first %S is the name of
 # an extension. The second %S is the name of the product (e.g., Firefox)
 processHang.add-on.label = A script in the extension “%S” is causing %S to slow down.
 processHang.add-on.learn-more.text = Learn more
 processHang.add-on.learn-more.url = https://support.mozilla.org/en-US/kb/warning-unresponsive-script?cache=no#w_other-causes
 processHang.button_stop.label = Stop It
 processHang.button_stop.accessKey = S
+processHang.button_stop_sandbox.label = Temporarily Disable Extension on Page
+processHang.button_stop_sandbox.accessKey = A
 processHang.button_wait.label = Wait
 processHang.button_wait.accessKey = W
 processHang.button_debug.label = Debug Script
 processHang.button_debug.accessKey = D
 
 # LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
 fullscreenButton.tooltip=Display the window in full screen (%S)
 
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -5,16 +5,17 @@
 KillScriptTitle=Warning: Unresponsive script
 KillScriptMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, or you can continue to see if the script will complete.
 KillScriptWithDebugMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.
 KillScriptLocation=Script: %S
 
 KillAddonScriptTitle=Warning: Unresponsive add-on script
 # LOCALIZATION NOTE (KillAddonScriptMessage): The first %S is the name of an add-on. The second %S is the name of the application (e.g., Firefox).
 KillAddonScriptMessage=A script from the add-on “%S” is running on this page, and making %S unresponsive.\n\nIt may be busy, or it may have stopped responsing permanently. You can stop the script now, or you can continue to see if it will complete.
+KillAddonScriptGlobalMessage=Prevent the add-on script from running on this page until it next reloads.
 
 StopScriptButton=Stop script
 DebugScriptButton=Debug script
 WaitForScriptButton=Continue
 DontAskAgain=&Don’t ask me again
 JSURLLoadBlockedWarning=Attempt to load a javascript: URL from one host\nin a window displaying content from another host\nwas blocked by the security manager.
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
 OnBeforeUnloadTitle=Are you sure?