From 135c24b36af305b248faad171d7710f9f4e08b43 Mon Sep 17 00:00:00 2001 From: Narcis Beleuzu Date: Tue, 10 Mar 2020 02:34:57 +0200 Subject: [PATCH] Backed out changeset 469e5a0fc374 (bug 455077) for tsan failures on gfxPlatform.cpp . CLOSED TREE --- modules/libpref/init/StaticPrefList.yaml | 2 +- testing/profiles/reftest/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 766eaef8051b..9e56b42e6935 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -3547,7 +3547,7 @@ # See eCMSMode in gfx/thebes/gfxPlatform.h. - name: gfx.color_management.mode type: RelaxedAtomicInt32 - value: 1 + value: 2 mirror: always # The zero default here should match QCMS_INTENT_DEFAULT from qcms.h diff --git a/testing/profiles/reftest/user.js b/testing/profiles/reftest/user.js index eaa72be39922..b4e0cdfcd22b 100644 --- a/testing/profiles/reftest/user.js +++ b/testing/profiles/reftest/user.js @@ -41,7 +41,7 @@ user_pref("extensions.getAddons.cache.enabled", false); user_pref("extensions.getAddons.get.url", "http://localhost/extensions-dummy/repositoryGetURL"); user_pref("extensions.systemAddon.update.url", "http://localhost/dummy-system-addons.xml"); user_pref("gfx.color_management.force_srgb", true); -user_pref("gfx.color_management.mode", 1); +user_pref("gfx.color_management.mode", 2); user_pref("gfx.logging.level", 1); // Disable downscale-during-decode, since it makes reftests more difficult. user_pref("image.downscale-during-decode.enabled", false);