Merge inbound to mozilla-central. a=merge
authorshindli <shindli@mozilla.com>
Mon, 17 Sep 2018 00:37:59 +0300
changeset 492379 5165e750ffab
parent 492377 f9d0225d85d2 (current diff)
parent 492378 1e167ef58df9 (diff)
child 492380 0d816433a453
child 492385 6ead24e2b991
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone64.0a1
first release with
nightly linux32
5165e750ffab / 64.0a1 / 20180916220033 / files
nightly linux64
5165e750ffab / 64.0a1 / 20180916220033 / files
nightly mac
5165e750ffab / 64.0a1 / 20180916220033 / files
nightly win32
5165e750ffab / 64.0a1 / 20180916220033 / files
nightly win64
5165e750ffab / 64.0a1 / 20180916220033 / 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 inbound to mozilla-central. a=merge
--- a/gfx/layers/ipc/CompositorManagerParent.cpp
+++ b/gfx/layers/ipc/CompositorManagerParent.cpp
@@ -320,17 +320,17 @@ CompositorManagerParent::RecvReportMemor
   // thread, so we can't just pass it over to the renderer thread. We use
   // an intermediate MozPromise instead.
   wr::RenderThread::AccumulateMemoryReport(aggregate)->Then(
     CompositorThreadHolder::Loop()->SerialEventTarget(), __func__,
     [resolver = std::move(aResolver)](MemoryReport aReport) {
       resolver(aReport);
     },
     [](bool) {
-      MOZ_ASSERT_UNREACHABLE();
+      MOZ_ASSERT_UNREACHABLE("MemoryReport promises are never rejected");
     }
   );
 
   return IPC_OK();
 }
 
 } // namespace layers
 } // namespace mozilla