diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-21 18:53:06 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-21 18:53:06 +0200 |
| commit | 306690e137c2bb031020ba3c2c1515ba731a23a5 (patch) | |
| tree | 81b242212f693af25c350668e3b72efbce9b224a /toolkit/xre/nsAppRunner.cpp | |
| parent | 4549256c2b685782587f2ccad6a105c0392492c7 (diff) | |
| parent | 0a744b1cfeecdd2487d9166792ac5234edc9ee6a (diff) | |
| download | UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.gz UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.lz UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.xz UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into data-transfer_1
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 12 |
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 |