diff options
| author | Dmitry Grigoryev <dmitry.grigoryev@outlook.com> | 2019-09-28 10:02:11 +0200 |
|---|---|---|
| committer | Dmitry Grigoryev <dmitry.grigoryev@outlook.com> | 2019-09-28 10:02:11 +0200 |
| commit | 70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c (patch) | |
| tree | 9d6be64e6a81c6fb02b2c0a179087ac0e5fe8a56 | |
| parent | 870375faa3f8c8af30d7fd8c2eb6c20dc6f325b1 (diff) | |
| parent | 81db54a1cbbaf9a8cbc64fcf8b232b0f1f13d14f (diff) | |
| download | UXP-70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c.tar UXP-70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c.tar.gz UXP-70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c.tar.lz UXP-70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c.tar.xz UXP-70f2d4cce1dd4fc64486cbdec6bf65fc66bce87c.zip | |
Merge branch 'master' of https://github.com/dimag0g/UXP
| -rw-r--r-- | modules/libpref/init/all.js | 9 | ||||
| -rw-r--r-- | mozglue/build/WindowsDllBlocklist.cpp | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index e69a985ce..b64c157c5 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -732,12 +732,19 @@ pref("gfx.layerscope.port", 23456); // This should be use to quickly find which slow paths are used by test cases. pref("gfx.perf-warnings.enabled", false); -// 0 = Off, 1 = Full, 2 = Tagged Images Only. +// 0 = Off, 1 = All Images, 2 = Tagged Images Only. // See eCMSMode in gfx/thebes/gfxPlatform.h +#ifdef XP_WIN pref("gfx.color_management.mode", 2); pref("gfx.color_management.display_profile", ""); pref("gfx.color_management.rendering_intent", 0); pref("gfx.color_management.enablev4", true); +#else +pref("gfx.color_management.mode", 0); +pref("gfx.color_management.display_profile", ""); +pref("gfx.color_management.rendering_intent", 0); +pref("gfx.color_management.enablev4", false); +#endif pref("gfx.downloadable_fonts.enabled", true); pref("gfx.downloadable_fonts.fallback_delay", 3000); diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp index c7d14041d..0686b64cb 100644 --- a/mozglue/build/WindowsDllBlocklist.cpp +++ b/mozglue/build/WindowsDllBlocklist.cpp @@ -227,6 +227,9 @@ static DllBlockInfo sWindowsDllBlocklist[] = { // Comodo IS old versions, startup crash on 64-bit, bug 1140397 { "guard64.dll", MAKE_VERSION(6, 3, 0, 0) }, + // 360 Safeguard/360 Total Security causes a11y crashes, bug 1536227. + { "safemon64.dll", ALL_VERSIONS }, + { nullptr, 0 } }; |