diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 23:03:00 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 23:03:00 +0100 |
| commit | 2b3b0e053e5148762c38e685f75c043253e9e8e1 (patch) | |
| tree | 48e555b726777fb0b1f074e7c680f6f1c1b57ded | |
| parent | e66dd9ee75b7ae60a63bb0350bc2c1101e82ca16 (diff) | |
| parent | d6f9957011bf2e52a9c531d4e9788f5aa8ea6032 (diff) | |
| download | UXP-2b3b0e053e5148762c38e685f75c043253e9e8e1.tar UXP-2b3b0e053e5148762c38e685f75c043253e9e8e1.tar.gz UXP-2b3b0e053e5148762c38e685f75c043253e9e8e1.tar.lz UXP-2b3b0e053e5148762c38e685f75c043253e9e8e1.tar.xz UXP-2b3b0e053e5148762c38e685f75c043253e9e8e1.zip | |
Merge branch 'master' into Basilisk-release
| -rw-r--r-- | dom/base/nsJSEnvironment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 3f28533d3..dfd380fc2 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -126,13 +126,13 @@ static const uint32_t kMaxICCDuration = 2000; // ms // Force a CC after this long if there's more than NS_CC_FORCED_PURPLE_LIMIT // objects in the purple buffer. #define NS_CC_FORCED (2 * 60 * PR_USEC_PER_SEC) // 2 min -#define NS_CC_FORCED_PURPLE_LIMIT 100 +#define NS_CC_FORCED_PURPLE_LIMIT 10 // Don't allow an incremental GC to lock out the CC for too long. #define NS_MAX_CC_LOCKEDOUT_TIME (30 * PR_USEC_PER_SEC) // 30 seconds // Trigger a CC if the purple buffer exceeds this size when we check it. -#define NS_CC_PURPLE_LIMIT 2000 +#define NS_CC_PURPLE_LIMIT 200 // Large value used to specify that a script should run essentially forever #define NS_UNLIMITED_SCRIPT_RUNTIME (0x40000000LL << 32) |