7 files changed, 52 insertions, 138 deletions
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index c8dd6dc47..0c0f9494a 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -57,8 +57,6 @@ toolkit.jar:
 #endif
    content/global/filepicker.properties
    content/global/globalOverlay.js
-   content/global/memoriam.xhtml
-*  content/global/mozilla.css
    content/global/mozilla.xhtml
 #ifdef MOZ_PHOENIX
    content/global/logopage.xhtml
diff --git a/toolkit/content/memoriam.xhtml b/toolkit/content/memoriam.xhtml
deleted file mode 100644
index f1a1b474d..000000000
--- a/toolkit/content/memoriam.xhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html
-[
-  <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
-  %directionDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-]>
-
-<!-- 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/. -->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset='utf-8' />
-    <title>Mozilla: In Memoriam</title>
-
-<style>
-html {
-  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
-  color: white;
-  font-style: italic;
-  text-rendering: optimizeLegibility;
-  min-height: 100%;
-}
-
-#moztext {
-  margin-top: 15%;
-  font-size: 1.1em;
-  font-family: serif;
-  text-align: center;
-  line-height: 1.5;
-}
-
-#from {
-  font-size: 1.0em;
-  font-family: serif;
-  text-align: right;
-}
-
-em {
-  font-size: 1.3em;
-  line-height: 0;
-}
-
-a {
-  text-decoration: none;
-  color: white;
-}
-</style>
-</head>
-
-<body dir="&locale.dir;">
-
-<section>
-  <p id="moztext">
-  <h1>Mozilla: In Memoriam</h1>
-  <br/>
-  Dedicated to the tireless developers who have come and gone.<br/>
-  To those who have put their heart and soul into Mozilla products.<br/>
-  To those who have seen their good intentions and hard work squandered.<br/>
-  To those who really cared about the user, and cared about usability.<br/>
-  To those who truly understood us and desired freedom, but were unheard.<br/>
-  To those who knew that change is inevitable, but loss of vision is not.<br/>
-  To those who were forced to give up the good fight.<br/>
-  <br/>
-  <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
-  <br/>
-  </p>
-
-  <p id="from">
-  </p>
-</section>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/toolkit/content/mozilla.css b/toolkit/content/mozilla.css
deleted file mode 100644
index d5eae6415..000000000
--- a/toolkit/content/mozilla.css
+++ /dev/null
@@ -1,36 +0,0 @@
-html {
-%ifdef MC_PALEMOON
-  background: #333399 radial-gradient( circle at 75% 25%, #6666b0 0%, #333399 40%, #111177 80%) center center / cover no-repeat;
-%else
-  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
-%endif
-
-  color: white;
-  font-style: italic;
-  text-rendering: optimizeLegibility;
-  min-height: 100%;
-}
-
-#moztext {
-  margin-top: 15%;
-  font-size: 1.1em;
-  font-family: serif;
-  text-align: center;
-  line-height: 1.5;
-}
-
-#from {
-  font-size: 1.95em;
-  font-family: serif;
-  text-align: right;
-}
-
-em {
-  font-size: 1.3em;
-  line-height: 0;
-}
-
-a {
-  text-decoration: none;
-  color: white;
-}
-\ No newline at end of file
diff --git a/toolkit/content/mozilla.xhtml b/toolkit/content/mozilla.xhtml
index 8c79b5ff9..f1a1b474d 100644
--- a/toolkit/content/mozilla.xhtml
+++ b/toolkit/content/mozilla.xhtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html
 [
-  <!ENTITY % mozillaDTD SYSTEM "chrome://global/locale/mozilla.dtd" >
-  %mozillaDTD;
   <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
   %directionDTD;
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
 ]>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,23 +13,64 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset='utf-8' />
-    <title>&chronicles.title.55.2;</title>
+    <title>Mozilla: In Memoriam</title>
 
-    <link rel="stylesheet" href="chrome://global/content/mozilla.css"
-          type="text/css"/>
+<style>
+html {
+  background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
+  color: white;
+  font-style: italic;
+  text-rendering: optimizeLegibility;
+  min-height: 100%;
+}
+
+#moztext {
+  margin-top: 15%;
+  font-size: 1.1em;
+  font-family: serif;
+  text-align: center;
+  line-height: 1.5;
+}
+
+#from {
+  font-size: 1.0em;
+  font-family: serif;
+  text-align: right;
+}
+
+em {
+  font-size: 1.3em;
+  line-height: 0;
+}
+
+a {
+  text-decoration: none;
+  color: white;
+}
+</style>
 </head>
 
 <body dir="&locale.dir;">
 
 <section>
   <p id="moztext">
-  &chronicles.quote.55.2;
+  <h1>Mozilla: In Memoriam</h1>
+  <br/>
+  Dedicated to the tireless developers who have come and gone.<br/>
+  To those who have put their heart and soul into Mozilla products.<br/>
+  To those who have seen their good intentions and hard work squandered.<br/>
+  To those who really cared about the user, and cared about usability.<br/>
+  To those who truly understood us and desired freedom, but were unheard.<br/>
+  To those who knew that change is inevitable, but loss of vision is not.<br/>
+  To those who were forced to give up the good fight.<br/>
+  <br/>
+  <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
+  <br/>
   </p>
 
   <p id="from">
-  &chronicles.from.55.2;
   </p>
 </section>
 
 </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/toolkit/locales/en-US/chrome/global/mozilla.dtd b/toolkit/locales/en-US/chrome/global/mozilla.dtd
deleted file mode 100644
index 038d8eb75..000000000
--- a/toolkit/locales/en-US/chrome/global/mozilla.dtd
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY chronicles.title.55.2
-'The Chronicles of the Pale Moon, 55:2'>
-
-<!ENTITY chronicles.quote.55.2
-'And so, our focus was drawn through time and space to the <em>emerging dragon</em> who would not abandon hope.<br/>
-Its resilience, stubbornness and spirit unbroken, and searching for long hours to find those willing to <em>join</em> its cause.<br/>
-The old nest abandoned, the death throes of the Beast ignored, and more determined than ever to find glory in the future.'>
-
-<!ENTITY chronicles.from.55.2
-'from <strong>The Chronicles of the Pale Moon,</strong> 55:2'>
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 23b9d72fb..e92e10599 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -67,7 +67,6 @@
   locale/@AB_CD@/global/intl.properties                 (%chrome/global/intl.properties)
   locale/@AB_CD@/global/keys.properties                 (%chrome/global/keys.properties)
   locale/@AB_CD@/global/languageNames.properties        (%chrome/global/languageNames.properties)
-  locale/@AB_CD@/global/mozilla.dtd                     (%chrome/global/mozilla.dtd)
 #ifndef MOZ_FENNEC
   locale/@AB_CD@/global/narrate.properties              (%chrome/global/narrate.properties)
 #endif
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 4c6ac558d..a862b1db4 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -460,7 +460,9 @@ var dataProviders = {
 
         // Eagerly free resources.
         let loseExt = gl.getExtension("WEBGL_lose_context");
-        loseExt.loseContext();
+        if (loseExt) {
+          loseExt.loseContext();
+        }
 
 
         return contextInfo;