Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge latest green inbound changeset and mozilla-central

Browse Source
This commit is contained in:
Ed Morley 2013-06-27 11:30:43 +01:00
commit d9747bc9bb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "6175336047b511e982827ae4ed559ee1f644a79e",
"revision": "e4d8c96f60dc17c64cf5374ab4e7f030de585bfa",
"repo_path": "/integration/gaia-central"
}

2
dom/base/nsJSEnvironment.cpp
View File

@ -3251,7 +3251,7 @@ SetMemoryGCPrefChangedCallback(const char* aPrefName, void* aClosure)
{
int32_t pref = Preferences::GetInt(aPrefName, -1);
// handle overflow and negative pref values
if (pref > 0 && pref < 10000)
if (pref >= 0 && pref < 10000)
JS_SetGCParameter(nsJSRuntime::sRuntime, (JSGCParamKey)(intptr_t)aClosure, pref);
return 0;
}

2
dom/workers/RuntimeService.cpp
View File

@ -377,7 +377,7 @@ UpdateCommonJSGCMemoryOption(RuntimeService* aRuntimeService,
int32_t prefValue = GetWorkerPref(aPrefName, -1);
uint32_t value =
(prefValue <= 0 || prefValue >= 10000) ? 0 : uint32_t(prefValue);
(prefValue < 0 || prefValue >= 10000) ? 0 : uint32_t(prefValue);
RuntimeService::SetDefaultJSGCSettings(aKey, value);