From f1e40aaa5b974b2b6bbfed82eeda031dd1d04904 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sun, 26 Jan 2020 10:28:17 +0100
Subject: Issue #1360 - Part 2: Update tests for changed preferences.

---
 testing/mochitest/runtests.py                                    | 5 -----
 testing/mozharness/configs/unittests/linux_unittest.py           | 3 ++-
 testing/mozharness/configs/unittests/win_taskcluster_unittest.py | 2 +-
 testing/mozharness/configs/unittests/win_unittest.py             | 2 +-
 testing/talos/talos/test.py                                      | 4 ++--
 testing/talos/talos/ttest.py                                     | 2 +-
 testing/testsuite-targets.mk                                     | 4 ++--
 testing/web-platform/harness/wptrunner/browsers/firefox.py       | 5 -----
 8 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'testing')

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index dd5439bd1..6763952af 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1678,11 +1678,6 @@ toolbar#nav-bar {
 
         prefs.update(self.extraPrefs(options.extraPrefs))
 
-        # Bug 1262954: For windows XP + e10s disable acceleration
-        if platform.system() in ("Windows", "Microsoft") and \
-           '5.1' in platform.version() and options.e10s:
-            prefs['layers.acceleration.disabled'] = True
-
         # interpolate preferences
         interpolation = {
             "server": "%s:%s" %
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 77e4ed501..b591fa559 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -222,7 +222,8 @@ config = {
         },
         "reftest-no-accel": {
             "options": ["--suite=reftest",
-                        "--setpref=layers.acceleration.force-enabled=disabled"],
+                        "--setpref=layers.acceleration.enabled=disabled",
+                        "--setpref=layers.acceleration.force=disabled"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]},
     },
     "all_xpcshell_suites": {
diff --git a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
index 161e8e65e..2eeae22e2 100644
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -204,7 +204,7 @@ config = {
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=gfx.direct2d.disabled=true",
-                        "--setpref=layers.acceleration.disabled=true"],
+                        "--setpref=layers.acceleration.enabled=false"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
     },
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index caa2978c6..1f682cc8f 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -204,7 +204,7 @@ config = {
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=gfx.direct2d.disabled=true",
-                        "--setpref=layers.acceleration.disabled=true"],
+                        "--setpref=layers.acceleration.enabled=false"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
     },
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index dc1306b8e..6df5835bb 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -556,8 +556,8 @@ class basic_compositor_video(PageloaderTest):
     sps_profile_interval = 1
     sps_profile_entries = 2000000
     preferences = {'full-screen-api.allow-trusted-requests-only': False,
-                   'layers.acceleration.force-enabled': False,
-                   'layers.acceleration.disabled': True,
+                   'layers.acceleration.force': False,
+                   'layers.acceleration.enabled': False,
                    'layout.frame_rate': 0,
                    'docshell.event_starvation_delay_hint': 1,
                    'full-screen-api.warning.timeout': 500,
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 4a0fcd135..3c57f020d 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -64,7 +64,7 @@ class TTest(object):
         # Bug 1262954: winxp + e10s, disable hwaccel
         if self.platform_type == "win_" and browser_config['e10s']:
             prefs = browser_config['preferences']
-            prefs['layers.acceleration.disabled'] = True
+            prefs['layers.acceleration.enabled'] = False
 
         with FFSetup(browser_config, test_config) as setup:
             return self._runTest(browser_config, test_config, setup)
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index ebe0d06cf..f10bd079c 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -60,11 +60,11 @@ RUN_REFTEST_B2G = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftestb2g.py \
 
 ifeq ($(OS_ARCH),WINNT) #{
 # GPU-rendered shadow layers are unsupported here
-OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true --setpref=layers.acceleration.disabled=true
+OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true --setpref=layers.acceleration.enabled=false
 GPU_RENDERING =
 else
 OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true
-GPU_RENDERING = --setpref=layers.acceleration.force-enabled=true
+GPU_RENDERING = --setpref=layers.acceleration.enabled=true --setpref=layers.acceleration.force=true
 endif #}
 
 reftest: TEST_PATH?=layout/reftests/reftest.list
diff --git a/testing/web-platform/harness/wptrunner/browsers/firefox.py b/testing/web-platform/harness/wptrunner/browsers/firefox.py
index 183820c5c..c03dd0eda 100644
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -142,11 +142,6 @@ class FirefoxBrowser(Browser):
         if self.e10s:
             self.profile.set_preferences({"browser.tabs.remote.autostart": True})
 
-        # Bug 1262954: winxp + e10s, disable hwaccel
-        if (self.e10s and platform.system() in ("Windows", "Microsoft") and
-            '5.1' in platform.version()):
-            self.profile.set_preferences({"layers.acceleration.disabled": True})
-
         if self.ca_certificate_path is not None:
             self.setup_ssl()
 
-- 
cgit v1.2.3


From c3d92cd33819d6d7463b9ddab2e045f16100e122 Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Tue, 28 Jan 2020 00:03:00 -0600
Subject: Issue #1356 - Add tests.

Forgot to include these before.
---
 testing/web-platform/meta/MANIFEST.json             |  4 ++++
 .../tests/dom/events/event-disabled-dynamic.html    | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 testing/web-platform/tests/dom/events/event-disabled-dynamic.html

(limited to 'testing')

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 03dda4a1f..4dbbdf43e 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -15393,6 +15393,10 @@
         "path": "dom/events/EventTarget-removeEventListener.html",
         "url": "/dom/events/EventTarget-removeEventListener.html"
       },
+      {
+	"path": "dom/events/event-disabled-dynamic.html",
+	"url": "/dom/events/event-disabled-dynamic.html"
+      },
       {
         "path": "dom/events/ProgressEvent.html",
         "url": "/dom/events/ProgressEvent.html"
diff --git a/testing/web-platform/tests/dom/events/event-disabled-dynamic.html b/testing/web-platform/tests/dom/events/event-disabled-dynamic.html
new file mode 100644
index 000000000..89a3d3b15
--- /dev/null
+++ b/testing/web-platform/tests/dom/events/event-disabled-dynamic.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test that disabled is honored immediately in presence of dynamic changes</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Andreas Farre" href="mailto:afarre@mozilla.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#enabling-and-disabling-form-controls:-the-disabled-attribute">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1405087">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<input type="button" value="Click" disabled>
+<script>
+async_test(t => {
+  window.addEventListener('load', t.step_func(() => {
++
+−    let e = document.querySelector('input');
+    e.disabled = false;
+    e.onclick = t.step_func_done(() => {});
+    e.click();
+  }));
+}, "disabled is honored properly in presence of dynamic changes");
+</script>
-- 
cgit v1.2.3


From ef71f96a8df97ce788e45b7594e713cb40cade0b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 21 Feb 2020 12:21:10 +0000
Subject: Remove gtest reference to non-existing path of removed component

---
 testing/gtest/moz.build | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'testing')

diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build
index d409023ec..f824cde88 100644
--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -77,9 +77,4 @@ if CONFIG['ENABLE_TESTS']:
         'gtest/include',
     ]
 
-    if CONFIG['OS_ARCH'] == 'WINNT':
-        LOCAL_INCLUDES += [
-            '/security/sandbox/chromium',
-        ]    
-    
     FINAL_LIBRARY = 'xul-gtest'
-- 
cgit v1.2.3


From b23e7b61c683ba44efcf0ecb59b3da439a9ff007 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 27 Mar 2020 15:13:00 +0100
Subject: Issue #1498 - Part 4: Remove clearPreloads.

Also tag #1280
---
 testing/marionette/cert.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'testing')

diff --git a/testing/marionette/cert.js b/testing/marionette/cert.js
index c0b24d23b..e54129c57 100644
--- a/testing/marionette/cert.js
+++ b/testing/marionette/cert.js
@@ -134,7 +134,6 @@ cert.InsecureSweepingOverride = function() {
       // clear collected HSTS and HPKP state
       // through the site security service
       sss.clearAll();
-      sss.clearPreloads();
     },
   };
 };
-- 
cgit v1.2.3