Merge mozilla-inbound to mozilla-central. a=merge
authorCosmin Sabou <csabou@mozilla.com>
Sat, 02 Mar 2019 23:47:53 +0200
changeset 462161 997e98493dbcd55c95b4a6eb4a44f563cd6174e9
parent 462160 42f9208ed5f3f4c98374661d05c5c74b8df4ff70 (current diff)
parent 462134 f3dc67a87eb4650f37d56e1d1bc8d79ab9653890 (diff)
child 462162 3030e03a5c84a6ae83c45a48caf3847601fe3d76
child 462164 9d7e7f0bc3eb64db9db2e816b32f16ab3782cac5
push id112263
push usercsabou@mozilla.com
push dateSat, 02 Mar 2019 21:51:17 +0000
treeherdermozilla-inbound@3030e03a5c84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone67.0a1
first release with
nightly linux32
997e98493dbc / 67.0a1 / 20190302214805 / files
nightly linux64
997e98493dbc / 67.0a1 / 20190302214805 / files
nightly mac
997e98493dbc / 67.0a1 / 20190302214805 / files
nightly win32
997e98493dbc / 67.0a1 / 20190302214805 / files
nightly win64
997e98493dbc / 67.0a1 / 20190302214805 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-inbound to mozilla-central. a=merge
gfx/layers/apz/util/TouchCounter.cpp
gfx/layers/apz/util/TouchCounter.h
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1901,21 +1901,22 @@ void nsJSContext::RunNextCollectorTimer(
     runnable = sInterSliceGCRunner;
   } else {
     // Check the CC timers after the GC timers, because the CC timers won't do
     // anything if a GC is in progress.
     MOZ_ASSERT(!sCCLockedOut,
                "Don't check the CC timers if the CC is locked out.");
 
     if (sCCRunner) {
+      MOZ_ASSERT(!sICCRunner,
+                 "Shouldn't have both sCCRunner and sICCRunner active at the "
+                 "same time");
       sCCRunner->SetDeadline(aDeadline);
       runnable = sCCRunner;
-    }
-
-    if (sICCRunner) {
+    } else if (sICCRunner) {
       sICCRunner->SetDeadline(aDeadline);
       runnable = sICCRunner;
     }
   }
 
   if (runnable) {
     runnable->Run();
   }
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3765,25 +3765,25 @@ JS_PUBLIC_API void JS::SetScriptPrivateR
   rt->scriptPrivateAddRefHook = addRefHook;
   rt->scriptPrivateReleaseHook = releaseHook;
 }
 
 JS_PUBLIC_API bool JS::ModuleInstantiate(JSContext* cx,
                                          JS::HandleObject moduleArg) {
   AssertHeapIsIdle();
   CHECK_THREAD(cx);
-  cx->check(moduleArg);
+  cx->releaseCheck(moduleArg);
   return ModuleObject::Instantiate(cx, moduleArg.as<ModuleObject>());
 }
 
 JS_PUBLIC_API bool JS::ModuleEvaluate(JSContext* cx,
                                       JS::HandleObject moduleArg) {
   AssertHeapIsIdle();
   CHECK_THREAD(cx);
-  cx->check(moduleArg);
+  cx->releaseCheck(moduleArg);
   return ModuleObject::Evaluate(cx, moduleArg.as<ModuleObject>());
 }
 
 JS_PUBLIC_API JSObject* JS::GetRequestedModules(JSContext* cx,
                                                 JS::HandleObject moduleArg) {
   AssertHeapIsIdle();
   CHECK_THREAD(cx);
   cx->check(moduleArg);
@@ -5157,17 +5157,17 @@ JS_PUBLIC_API bool JS_GetPendingExceptio
     return false;
   }
   return cx->getPendingException(vp);
 }
 
 JS_PUBLIC_API void JS_SetPendingException(JSContext* cx, HandleValue value) {
   AssertHeapIsIdle();
   CHECK_THREAD(cx);
-  cx->check(value);
+  cx->releaseCheck(value);
   cx->setPendingException(value);
 }
 
 JS_PUBLIC_API void JS_ClearPendingException(JSContext* cx) {
   AssertHeapIsIdle();
   cx->clearPendingException();
 }