WIP FELT: Add an about:restartforced page

Alexandre Lissy · Alexandre Lissy · commit 18846f8a175f · 2025-09-04T14:19:22.000+02:00
Differential Revision: https://phabricator.services.mozilla.com/D262889
diff --git a/browser/base/content/aboutRestartForced.js b/browser/base/content/aboutRestartForced.js
@@ -0,0 +1,42 @@
+/* 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/. */
+
+/* eslint-env mozilla/remote-page */
+
+var AboutRestartForced = {
+  /* Only do autofocus if we're the toplevel frame; otherwise we
+     don't want to call attention to ourselves!  The key part is
+     that autofocus happens on insertion into the tree, so we
+     can remove the button, add @autofocus, and reinsert the
+     button.
+  */
+  addAutofocus() {
+    if (window.top == window) {
+      var button = document.getElementById("restart");
+      var parent = button.parentNode;
+      button.remove();
+      button.setAttribute("autofocus", "true");
+      parent.insertAdjacentElement("afterbegin", button);
+    }
+  },
+  restart() {
+    Services.startup.quit(
+      Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit
+    );
+  },
+  init() {
+    this.addAutofocus();
+  },
+};
+
+AboutRestartForced.init();
+
+let restartButton = document.getElementById("restart");
+restartButton.onclick = function () {
+  AboutRestartForced.restart();
+};
+
+// Dispatch this event so tests can detect that we finished loading the page.
+let event = new CustomEvent("AboutRestartForcedLoad", { bubbles: true });
+document.dispatchEvent(event);
diff --git a/browser/base/content/aboutRestartForced.xhtml b/browser/base/content/aboutRestartForced.xhtml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 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/. -->
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src chrome:; object-src 'none'"
+    />
+    <meta name="color-scheme" content="light dark" />
+    <title data-l10n-id="restart-forced-title"></title>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      media="all"
+      href="chrome://browser/skin/aboutRestartRequired.css"
+    />
+    <!-- If the location of the favicon is changed here, the
+         FAVICON_ERRORPAGE_URL symbol in
+         toolkit/components/places/src/nsFaviconService.h should be updated. -->
+    <link
+      rel="icon"
+      type="image/png"
+      id="favicon"
+      href="chrome://global/skin/icons/info.svg"
+    />
+    <link rel="localization" href="branding/brand.ftl" />
+    <link rel="localization" href="browser/aboutRestartForced.ftl" />
+  </head>
+  <body>
+    <!-- PAGE CONTAINER (for styling purposes only) -->
+    <div id="errorPageContainer">
+      <div id="text-container">
+        <div class="title" id="title">
+          <h1
+            class="title-text"
+            id="title-text"
+            data-l10n-id="restart-forced-heading"
+          />
+        </div>
+        <div id="errorLongContent">
+          <div id="errorLongDesc">
+            <p data-l10n-id="restart-forced-intro" />
+            <p data-l10n-id="window-restoration-info" />
+          </div>
+        </div>
+      </div>
+      <!-- Restart Button -->
+      <div id="restartButtonContainer" class="button-container">
+        <button
+          id="restart"
+          data-l10n-id="restart-button-label"
+          class="primary"
+          autocomplete="off"
+        ></button>
+      </div>
+    </div>
+  </body>
+  <script src="chrome://browser/content/aboutRestartForced.js" />
+</html>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
@@ -10,6 +10,8 @@ browser.jar:
         content/browser/aboutDialog.css               (content/aboutDialog.css)
         content/browser/aboutRestartRequired.js       (content/aboutRestartRequired.js)
         content/browser/aboutRestartRequired.xhtml    (content/aboutRestartRequired.xhtml)
+        content/browser/aboutRestartForced.js         (content/aboutRestartForced.js)
+        content/browser/aboutRestartForced.xhtml      (content/aboutRestartForced.xhtml)
         content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
         content/browser/aboutRobots.js                (content/aboutRobots.js)
         content/browser/aboutRobots.css               (content/aboutRobots.css)
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
@@ -126,6 +126,8 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"restartrequired", "chrome://browser/content/aboutRestartRequired.xhtml",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
+    {"restartforced", "chrome://browser/content/aboutRestartForced.xhtml",
+     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"protections", "chrome://browser/content/protections.html",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf
@@ -21,6 +21,7 @@ pages = [
     'profiling',
     'reader',
     'restartrequired',
+    'restartforced',
     'rights',
     'robots',
     'sessionrestore',
diff --git a/browser/locales/en-US/browser/aboutRestartForced.ftl b/browser/locales/en-US/browser/aboutRestartForced.ftl
@@ -0,0 +1,10 @@
+# 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/.
+
+restart-forced-title = Restart Forced
+restart-forced-heading = Restart to Keep Using { -brand-short-name }
+restart-forced-intro = Policy requires that { -brand-short-name } needs to be restarted.
+window-restoration-info = Your windows and tabs will be quickly restored, but private ones will not.
+
+restart-button-label = Restart { -brand-short-name }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -3559,6 +3559,16 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
     errorPage.AssignLiteral("restartrequired");
     error = "restartrequired";
 
+    // DisplayLoadError requires a non-empty messageStr to proceed and call
+    // LoadErrorPage. If the page doesn't have a title, we will use a blank
+    // space which will be trimmed and thus treated as empty by the front-end.
+    if (messageStr.IsEmpty()) {
+      messageStr.AssignLiteral(u" ");
+    }
+  } else if (NS_ERROR_RESTART_FORCED == aError) {
+    errorPage.AssignLiteral("restartforced");
+    error = "restartForced";
+
     // DisplayLoadError requires a non-empty messageStr to proceed and call
     // LoadErrorPage. If the page doesn't have a title, we will use a blank
     // space which will be trimmed and thus treated as empty by the front-end.
@@ -6319,6 +6329,7 @@ nsresult nsDocShell::FilterStatusForErrorPage(
        aStatus == NS_ERROR_PROXY_TOO_MANY_REQUESTS ||
        aStatus == NS_ERROR_MALFORMED_URI ||
        aStatus == NS_ERROR_BLOCKED_BY_POLICY ||
+       aStatus == NS_ERROR_RESTART_FORCED ||
        aStatus == NS_ERROR_DOM_COOP_FAILED ||
        aStatus == NS_ERROR_DOM_COEP_FAILED ||
        aStatus == NS_ERROR_DOM_INVALID_HEADER_VALUE) &&
@@ -8536,6 +8547,9 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
         if (shouldLoad == nsIContentPolicy::REJECT_POLICY) {
           return NS_ERROR_BLOCKED_BY_POLICY;
         }
+        if (shouldLoad == nsIContentPolicy::REJECT_RESTARTFORCED) {
+          return NS_ERROR_RESTART_FORCED;
+        }
       }
 
       return NS_ERROR_CONTENT_BLOCKED;
diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl
@@ -522,6 +522,11 @@ interface nsIContentPolicy : nsISupports
    */
   const short REJECT_POLICY = -5;
 
+  /**
+   * Returned from shouldLoad or shouldProcess if restart is forced 
+   */
+  const short REJECT_RESTARTFORCED = -6;
+
   /**
    * Returned from shouldLoad or shouldProcess if the load or process request
    * is not rejected.
diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp
@@ -539,6 +539,9 @@ static nsresult DoContentSecurityChecks(nsIChannel* aChannel,
       if (shouldLoad == nsIContentPolicy::REJECT_POLICY) {
         return NS_ERROR_BLOCKED_BY_POLICY;
       }
+      if (shouldLoad == nsIContentPolicy::REJECT_RESTARTFORCED) {
+        return NS_ERROR_RESTART_FORCED;
+      }
     }
     return NS_ERROR_CONTENT_BLOCKED;
   }
diff --git a/xpcom/base/ErrorList.py b/xpcom/base/ErrorList.py
@@ -984,6 +984,7 @@ def SUCCESS(code):
     # Error code for when the content process had a different buildID than the
     # parent
     errors["NS_ERROR_BUILDID_MISMATCH"] = FAILURE(17)
+    errors["NS_ERROR_RESTART_FORCED"] = FAILURE(18)
 
     errors["NS_PROPTABLE_PROP_OVERWRITTEN"] = SUCCESS(11)
     # Error codes for FindBroadcaster in XULBroadcastManager.cpp

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,9 @@ static nsresult DoContentSecurityChecks(nsIChannel* aChannel,`
`539`	`539`	`if (shouldLoad == nsIContentPolicy::REJECT_POLICY) {`
`540`	`540`	`return NS_ERROR_BLOCKED_BY_POLICY;`
`541`	`541`	`}`
	`542`	`+ if (shouldLoad == nsIContentPolicy::REJECT_RESTARTFORCED) {`
	`543`	`+ return NS_ERROR_RESTART_FORCED;`
	`544`	`+ }`
`542`	`545`	`}`
`543`	`546`	`return NS_ERROR_CONTENT_BLOCKED;`
`544`	`547`	`}`