Backout bug 1368286 because of event processing regressions with nested event loops on OSX a=RyanVM
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 31 May 2017 22:45:35 -0400
changeset 412150 edffa38ec0c515198f360f23d286290cb5081996
parent 412149 a8f378825e81daff1279a7d6e940b610912ee6dc
child 412151 c81fbc7bbc63ccde05ba7bc132b9cbd57f606da0
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1368286
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout bug 1368286 because of event processing regressions with nested event loops on OSX a=RyanVM Landing on a CLOSED TREE
xpcom/threads/nsThread.cpp
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -1041,18 +1041,17 @@ NS_IMETHODIMP
 nsThread::HasPendingEvents(bool* aResult)
 {
   if (NS_WARN_IF(PR_GetCurrentThread() != mThread)) {
     return NS_ERROR_NOT_SAME_THREAD;
   }
 
   {
     MutexAutoLock lock(mLock);
-    *aResult = mEvents->HasPendingEvent(lock) ||
-               mIdleEvents.HasPendingEvent(lock);
+    *aResult = mEvents->HasPendingEvent(lock);
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsThread::RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod> aIdlePeriod)
 {
   if (NS_WARN_IF(PR_GetCurrentThread() != mThread)) {