From 0749a8828c047c0389c9a7d763f43f41840cac1e Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 14 May 2022 11:06:02 +0000
Subject: [PATCH 1/5] Issue #1899 - Disable the (broken) MDN integration widget
 by default.

---
 devtools/client/preferences/devtools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
index 2f31e18e30..5bbd5a0946 100644
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -59,7 +59,7 @@ pref("devtools.inspector.showUserAgentStyles", false);
 // Show all native anonymous content (like controls in <video> tags)
 pref("devtools.inspector.showAllAnonymousContent", false);
 // Enable the MDN docs tooltip
-pref("devtools.inspector.mdnDocsTooltip.enabled", true);
+pref("devtools.inspector.mdnDocsTooltip.enabled", false);
 
 // Enable the Font Inspector
 pref("devtools.fontinspector.enabled", true);

From 349d3d96a2b418b2342e9335cc6d09ca70b6c1d0 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 14 May 2022 12:22:48 +0000
Subject: [PATCH 2/5] Issue #1899 - Make sure the test for it still works

Some hoops to make sure the test still works if the default value for the pref
is false, requiring setting and resetting it and making sure the observers have
time to react to these changes before testing.
---
 ...ser_rules_context-menu-show-mdn-docs-01.js | 43 +++++++++++++++++++
 ...ser_rules_context-menu-show-mdn-docs-03.js |  4 +-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-01.js b/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-01.js
index 6fd8fb8150..00582bbe1d 100644
--- a/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-01.js
+++ b/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-01.js
@@ -20,6 +20,11 @@
  * code by having a tag called "padding" and a property
  * value called "margin".
  */
+
+const { PrefObserver } = require("devtools/client/shared/prefs");
+const PREF_ENABLE_MDN_DOCS_TOOLTIP =
+  "devtools.inspector.mdnDocsTooltip.enabled";
+
 const TEST_URI = `
   <html>
     <head>
@@ -35,12 +40,50 @@ const TEST_URI = `
 `;
 
 add_task(function* () {
+  info("Ensure the pref is true to begin with");
+  let initial = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
+  if (initial != true) {
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
+  }
+
   yield addTab("data:text/html;charset=utf8," + encodeURIComponent(TEST_URI));
   let {inspector, view} = yield openRuleView();
   yield selectNode("padding", inspector);
   yield testMdnContextMenuItemVisibility(view);
+
+  info("Ensure the pref is reset to its initial value");
+  let eventual = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
+  if (eventual != initial) {
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
+  }
 });
 
+/**
+ * Set a boolean pref, and wait for the pref observer to
+ * trigger, so that code listening for the pref change
+ * has had a chance to update itself.
+ *
+ * @param pref {string} Name of the pref to change
+ * @param state {boolean} Desired value of the pref.
+ *
+ * Note that if the pref already has the value in `state`,
+ * then the prefObserver will not trigger. So you should only
+ * call this function if you know the pref's current value is
+ * not `state`.
+ */
+function* setBooleanPref(pref, state) {
+  let oncePrefChanged = defer();
+  let prefObserver = new PrefObserver("devtools.");
+  prefObserver.on(pref, oncePrefChanged.resolve);
+
+  info("Set the pref " + pref + " to: " + state);
+  Services.prefs.setBoolPref(pref, state);
+
+  info("Wait for prefObserver to call back so the UI can update");
+  yield oncePrefChanged.promise;
+  prefObserver.off(pref, oncePrefChanged.resolve);
+}
+
 /**
  * Tests that the MDN context menu item is shown when it should be,
  * and hidden when it should be.
diff --git a/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-03.js b/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-03.js
index ac5f636a20..eb1527d7b9 100644
--- a/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-03.js
+++ b/devtools/client/inspector/rules/test/browser_rules_context-menu-show-mdn-docs-03.js
@@ -32,7 +32,7 @@ add_task(function* () {
   info("Ensure the pref is true to begin with");
   let initial = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
   if (initial != true) {
-    setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
   }
 
   yield addTab("data:text/html;charset=utf8," + encodeURIComponent(TEST_DOC));
@@ -58,7 +58,7 @@ add_task(function* () {
   info("Ensure the pref is reset to its initial value");
   let eventual = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
   if (eventual != initial) {
-    setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
   }
 });
 

From d42af42d260ce1da2ec8dd899cedc765fb248266 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Sun, 15 May 2022 22:31:46 +0800
Subject: [PATCH 3/5] Issue #1898 - Make sure that the sanity test stops
 running if necessary

As part of telemetry removal, d60103257eb83db103f9acab54b1755486b7e9c1 removed the `reportResult` function which also handles the stopping of the sanity test. This also removes unused histogram enumeration values and revises/adds some comments.
---
 toolkit/components/gfx/SanityTest.js | 45 +++++++++++-----------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/toolkit/components/gfx/SanityTest.js b/toolkit/components/gfx/SanityTest.js
index 03b9067ef5..3bf7a3f1d2 100644
--- a/toolkit/components/gfx/SanityTest.js
+++ b/toolkit/components/gfx/SanityTest.js
@@ -22,27 +22,6 @@ const DISABLE_VIDEO_PREF="media.hardware-video-decoding.failed";
 const RUNNING_PREF="sanity-test.running";
 const TIMEOUT_SEC=20;
 
-// GRAPHICS_SANITY_TEST histogram enumeration values
-const TEST_PASSED=0;
-const TEST_FAILED_RENDER=1;
-const TEST_FAILED_VIDEO=2;
-const TEST_CRASHED=3;
-const TEST_TIMEOUT=4;
-
-// GRAPHICS_SANITY_TEST_REASON enumeration values.
-const REASON_FIRST_RUN=0;
-const REASON_FIREFOX_CHANGED=1;
-const REASON_DEVICE_CHANGED=2;
-const REASON_DRIVER_CHANGED=3;
-
-// GRAPHICS_SANITY_TEST_OS_SNAPSHOT histogram enumeration values
-const SNAPSHOT_VIDEO_OK=0;
-const SNAPSHOT_VIDEO_FAIL=1;
-const SNAPSHOT_ERROR=2;
-const SNAPSHOT_TIMEOUT=3;
-const SNAPSHOT_LAYERS_OK=4;
-const SNAPSHOT_LAYERS_FAIL=5;
-
 function testPixel(ctx, x, y, r, g, b, a, fuzz) {
   var data = ctx.getImageData(x, y, 1, 1);
 
@@ -55,6 +34,11 @@ function testPixel(ctx, x, y, r, g, b, a, fuzz) {
   return false;
 }
 
+function stopRunning() {
+  Preferences.set(RUNNING_PREF, false);
+  Services.prefs.savePrefFile(null);
+}
+
 function setTimeout(aMs, aCallback) {
   var timer = Cc['@mozilla.org/timer;1'].
                 createInstance(Ci.nsITimer);
@@ -100,15 +84,18 @@ function testCompositor(win, ctx) {
   var testPassed = true;
 
   if (!verifyVideoRendering(ctx)) {
+    stopRunning();
     Preferences.set(DISABLE_VIDEO_PREF, true);
     testPassed = false;
   }
 
   if (!verifyLayersRendering(ctx)) {
+    stopRunning();
     testPassed = false;
   }
 
   if (testPassed) {
+    stopRunning();
   }
 
   return testPassed;
@@ -130,8 +117,10 @@ var listener = {
     this.win.onload = this.onWindowLoaded.bind(this);
     this.utils = this.win.QueryInterface(Ci.nsIInterfaceRequestor)
                          .getInterface(Ci.nsIDOMWindowUtils);
+    // Stop running the test if it timed out.
     setTimeout(TIMEOUT_SEC * 1000, () => {
       if (this.win) {
+        stopRunning();
         this.endTest();
       }
     });
@@ -208,17 +197,19 @@ SanityTest.prototype = {
                                          Ci.nsISupportsWeakReference]),
 
   shouldRunTest: function() {
-    // Only test gfx features if firefox has updated, or if the user has a new
-    // gpu or drivers.
+    // Only test GFX features if the application was updated, or if the user
+    // has a new GPU or drivers.
     var buildId = Services.appinfo.platformBuildID;
     var gfxinfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
 
+    // Stop the test and disable hardware video decoding if we crashed.
     if (Preferences.get(RUNNING_PREF, false)) {
       Preferences.set(DISABLE_VIDEO_PREF, true);
+      stopRunning();
       return false;
     }
 
-    function checkPref(pref, value, reason) {
+    function checkPref(pref, value) {
       var prefValue = Preferences.get(pref, undefined);
       if (prefValue == value) {
         return true;
@@ -227,9 +218,9 @@ SanityTest.prototype = {
     }
 
     // TODO: Handle dual GPU setups
-    if (checkPref(DRIVER_PREF, gfxinfo.adapterDriverVersion, REASON_DRIVER_CHANGED) &&
-        checkPref(DEVICE_PREF, gfxinfo.adapterDeviceID, REASON_DEVICE_CHANGED) &&
-        checkPref(VERSION_PREF, buildId, REASON_FIREFOX_CHANGED))
+    if (checkPref(DRIVER_PREF, gfxinfo.adapterDriverVersion) &&
+        checkPref(DEVICE_PREF, gfxinfo.adapterDeviceID) &&
+        checkPref(VERSION_PREF, buildId))
     {
       return false;
     }

From 40e9f40e89e981c62f25305c70c84e4bdfe03fa5 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 16 May 2022 20:08:29 +0000
Subject: [PATCH 4/5] Issue #1813 - Enable date and time picker by default.

Resolves #1813
---
 modules/libpref/init/all.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 580d3b36f7..9af22b1c27 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1180,16 +1180,16 @@ pref("dom.forms.number", true);
 // platforms which don't have a color picker implemented yet.
 pref("dom.forms.color", true);
 
-// Support for input type=date and type=time. By default, disabled.
-pref("dom.forms.datetime", false);
+// Support for input type=date and type=time.
+pref("dom.forms.datetime", true);
 
-// Support for input type=month, type=week and type=datetime-local. By default,
-// disabled.
+// Enable time picker UI.
+pref("dom.forms.datetime.timepicker", true);
+
+// Support for input type=month, type=week and type=datetime-local.
+// TODO: implement/fix these.
 pref("dom.forms.datetime.others", false);
 
-// Enable time picker UI. By default, disabled.
-pref("dom.forms.datetime.timepicker", false);
-
 // Support for new @autocomplete values
 pref("dom.forms.autocomplete.experimental", false);
 

From 8dfcd4553fc57cf2816c204bfc2f6e69a7c176ff Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 16 May 2022 20:12:09 +0000
Subject: [PATCH 5/5] Issue #1210 - Keep timepicker disabled for now.

This needs localization work before enabling.
---
 modules/libpref/init/all.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 9af22b1c27..e7a5b32dff 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1184,7 +1184,7 @@ pref("dom.forms.color", true);
 pref("dom.forms.datetime", true);
 
 // Enable time picker UI.
-pref("dom.forms.datetime.timepicker", true);
+pref("dom.forms.datetime.timepicker", false);
 
 // Support for input type=month, type=week and type=datetime-local.
 // TODO: implement/fix these.
