From 2c1e594fe70b22132ecec3a2a49e58c93f44c488 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 15 Mar 2016 13:12:27 +0800 Subject: [PATCH] Bug 1236789. Part 2 - fix assertions when |aFlags == NS_DISPATCH_TAIL|. r=bholley MozReview-Commit-ID: E5a8zP9cMI6 --- xpcom/threads/nsThreadPool.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 65ade4f60eff..8be613d57823 100644 --- a/xpcom/threads/nsThreadPool.cpp +++ b/xpcom/threads/nsThreadPool.cpp @@ -272,7 +272,8 @@ nsThreadPool::Dispatch(already_AddRefed&& aEvent, uint32_t aFlags) NS_ProcessNextEvent(thread); } } else { - NS_ASSERTION(aFlags == NS_DISPATCH_NORMAL, "unexpected dispatch flags"); + NS_ASSERTION(aFlags == NS_DISPATCH_NORMAL || + aFlags == NS_DISPATCH_TAIL, "unexpected dispatch flags"); PutEvent(Move(aEvent), aFlags); } return NS_OK;