Merge inbound to mozilla-central. a=merge
authorshindli <shindli@mozilla.com>
Mon, 17 Sep 2018 00:37:59 +0300
changeset 436643 5165e750ffabb930deb846410ab62dcc6d1f9e52
parent 436641 f9d0225d85d27a282df6aa3ecdc691037a19492c (current diff)
parent 436642 1e167ef58df92afd693b415023cb2aa65b92e465 (diff)
child 436644 0d816433a453683419d3201ff1e83786209631d2
child 436649 6ead24e2b991fc955db9ce3f2a17fb28a55daa0d
push id34653
push usershindli@mozilla.com
push dateSun, 16 Sep 2018 21:38:10 +0000
treeherdermozilla-central@5165e750ffab [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