Merge latest green inbound changeset and mozilla-central

b2g/config/gaia.json

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

dom/base/nsJSEnvironment.cpp

@@ -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;
 }

dom/workers/RuntimeService.cpp

@@ -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);