summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-21 15:05:05 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-21 15:05:05 +0200
commit21f5ffe826a1c776d25354c01697ff1bff9b04e9 (patch)
treef0410974af23d5d958e02e13883dfc3cf51415f3 /toolkit
parent844da4597f92c4d603e8df2c1f5c8b23f31904f0 (diff)
downloadUXP-21f5ffe826a1c776d25354c01697ff1bff9b04e9.tar
UXP-21f5ffe826a1c776d25354c01697ff1bff9b04e9.tar.gz
UXP-21f5ffe826a1c776d25354c01697ff1bff9b04e9.tar.lz
UXP-21f5ffe826a1c776d25354c01697ff1bff9b04e9.tar.xz
UXP-21f5ffe826a1c776d25354c01697ff1bff9b04e9.zip
Disallow E10S to run.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/xre/nsAppRunner.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 776044d72..3493cd837 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4306,7 +4306,6 @@ MultiprocessBlockPolicy() {
if (addonsCanDisable && disabledByAddons) {
gMultiprocessBlockPolicy = kE10sDisabledForAddons;
- return gMultiprocessBlockPolicy;
}
#if defined(XP_WIN)
@@ -4340,16 +4339,13 @@ MultiprocessBlockPolicy() {
if (disabledForA11y) {
gMultiprocessBlockPolicy = kE10sDisabledForAccessibility;
- return gMultiprocessBlockPolicy;
}
#endif
+
+ // We do not support E10S, block by policy.
+ gMultiprocessBlockPolicy = kE10sForceDisabled;
- /*
- * None of the blocking policies matched, so e10s is allowed to run.
- * Cache the information and return 0, indicating success.
- */
- gMultiprocessBlockPolicy = 0;
- return 0;
+ return gMultiprocessBlockPolicy;
}
bool