From b3d9616178d7bd6876a7c4708dbed34f8968a4dc Mon Sep 17 00:00:00 2001 From: Bogdan Tara Date: Fri, 5 Feb 2021 16:12:09 +0200 Subject: [PATCH] Backed out changeset e21ae6fdc524 (bug 1690898) for Event-dispatch-redispatch.html failures CLOSED TREE --- modules/libpref/init/StaticPrefList.yaml | 3 --- python/mozbuild/mozbuild/mozinfo.py | 1 - .../dom/events/Event-dispatch-redispatch.html.ini | 7 ++++++- ...aseline-alignment-and-overflow.tentative.html.ini | 12 ++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index ecf5b965ed1a..ded66f5ac6d3 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -10496,9 +10496,6 @@ #--------------------------------------------------------------------------- # Global user preference for disabling native theme in content processes. -# -# NOTE(emilio): When changing this make sure to update the non_native_theme -# entry in python/mozbuild/mozbuild/mozinfo.py - name: widget.disable-native-theme-for-content type: RelaxedAtomicBool #if defined(XP_LINUX) && defined(NIGHTLY_BUILD) && !defined(ANDROID) diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index 6c9d46573369..8eeb0716baaf 100644 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -96,7 +96,6 @@ def build_dict(config, env=os.environ): d["artifact"] = substs.get("MOZ_ARTIFACT_BUILDS") == "1" d["ccov"] = substs.get("MOZ_CODE_COVERAGE") == "1" d["cc_type"] = substs.get("CC_TYPE") - d["non_native_theme"] = d["os"] == "linux" and d["nightly_build"] def guess_platform(): if d["buildapp"] == "browser": diff --git a/testing/web-platform/meta/dom/events/Event-dispatch-redispatch.html.ini b/testing/web-platform/meta/dom/events/Event-dispatch-redispatch.html.ini index eb52d5df2e33..9a2d2a8fafe6 100644 --- a/testing/web-platform/meta/dom/events/Event-dispatch-redispatch.html.ini +++ b/testing/web-platform/meta/dom/events/Event-dispatch-redispatch.html.ini @@ -1,4 +1,9 @@ [Event-dispatch-redispatch.html] [Redispatching mouseup event whose default action dispatches a click event] expected: - if (os == "linux") and not non_native_theme: FAIL + if os == "mac": PASS + if os == "android": PASS + if (os == "linux") and release_or_beta: FAIL + if os == "linux": PASS + FAIL + diff --git a/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini b/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini index 766e739f57c7..912922d4d707 100644 --- a/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini +++ b/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini @@ -1,24 +1,24 @@ [baseline-alignment-and-overflow.tentative.html] [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL [] expected: - if (os == "linux") and not non_native_theme: FAIL + if (os == "linux") and release_or_beta: FAIL