From 6ac5b1589c13f49060a5f7610f91748e586a19d3 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 11 Jan 2012 11:11:32 -0500 Subject: [PATCH] Bug 717092 - Rename pref 'low_physical_mem_threshold_mb' to 'low_physical_memory_threshold_mb', for consistency with the other low-memory prefs. r=njn --- modules/libpref/src/init/all.js | 2 +- xpcom/base/AvailableMemoryTracker.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 8deb40c6a12..9744abf23ac 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -3414,7 +3414,7 @@ pref("memory.low_virtual_memory_threshold_mb", 128); // On Windows 32- or 64-bit, fire a low-memory notification if we have less // than this many mb of physical memory available on the whole machine. -pref("memory.low_physical_mem_threshold_mb", 0); +pref("memory.low_physical_memory_threshold_mb", 0); // On Windows 32- or 64-bit, don't fire a low-memory notification because of // low available physical memory more than once every diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp index 261041bb517..b51e866fd1f 100644 --- a/xpcom/base/AvailableMemoryTracker.cpp +++ b/xpcom/base/AvailableMemoryTracker.cpp @@ -414,7 +414,7 @@ public: if (sLowPhysicalMemoryThreshold == 0 || !sHooksInstalled) { aDescription.Append(nsPrintfCString(1024, "Tracking low-physical-memory events is disabled, but you can enable it " - "by giving the memory.low_physical_mem_threshold_mb pref a non-zero " + "by giving the memory.low_physical_memory_threshold_mb pref a non-zero " "value%s.", sHooksInstalled ? "" : " and restarting")); } @@ -422,7 +422,7 @@ public: aDescription.Append(nsPrintfCString(1024, "We fire such an event if we notice there is less than %d MB of " "available physical memory (controlled by the " - "'memory.low_physical_mem_threshold_mb' pref). The machine will start " + "'memory.low_physical_memory_threshold_mb' pref). The machine will start " "to page if it runs out of physical memory; this may cause it to run " "slowly, but it shouldn't cause us to crash.", sLowPhysicalMemoryThreshold)); @@ -451,7 +451,7 @@ void Init() } Preferences::AddUintVarCache(&sLowPhysicalMemoryThreshold, - "memory.low_physical_mem_threshold_mb", 0); + "memory.low_physical_memory_threshold_mb", 0); Preferences::AddUintVarCache(&sLowPhysicalMemoryNotificationIntervalMS, "memory.low_physical_memory_notification_interval_ms", 10000);