From 91cd09280fed9c4192f2db808d47f1c22cce18e8 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Fri, 21 Nov 2014 16:03:53 -0800 Subject: [PATCH] Backed out changeset 012e11e54840 (Bug 1101921) for build bustage on a CLOSED TREE --HG-- extra : rebase_source : 38aac2c757b138fbdf754abb374f326048a5516a --- js/public/HeapAPI.h | 2 +- js/src/gc/Nursery.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h index 5607afce1d39..37784136957b 100644 --- a/js/public/HeapAPI.h +++ b/js/public/HeapAPI.h @@ -98,7 +98,7 @@ namespace JS { struct Zone; /* Default size for the generational nursery in bytes. */ -const uint32_t DefaultNurseryBytes = 16 * ChunkSize; +const uint32_t DefaultNurseryBytes = 16 * 1024 * 1024; /* Default maximum heap size in bytes to pass to JS_NewRuntime(). */ const uint32_t DefaultHeapMaxBytes = 32 * 1024 * 1024; diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h index a031e348511c..7efa372380eb 100644 --- a/js/src/gc/Nursery.h +++ b/js/src/gc/Nursery.h @@ -71,7 +71,7 @@ class Nursery {} ~Nursery(); - bool init(uint32_t maxNurseryBytes); + bool init(uint32_t numNurseryChunks); bool exists() const { return numNurseryChunks_ != 0; } size_t numChunks() const { return numNurseryChunks_; }