From 154c073fb8ad519f5280eb1253f3db0f37c80bcd Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 23 Jan 2014 11:50:52 -0500 Subject: [PATCH] Backed out changeset 5297eafc36e2 (bug 962911) for making B2G reftests much more failure-prone. CLOSED TREE --- widget/xpwidgets/nsBaseAppShell.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/widget/xpwidgets/nsBaseAppShell.cpp b/widget/xpwidgets/nsBaseAppShell.cpp index b80d5438d590..946ee0f35bf8 100644 --- a/widget/xpwidgets/nsBaseAppShell.cpp +++ b/widget/xpwidgets/nsBaseAppShell.cpp @@ -14,7 +14,7 @@ // When processing the next thread event, the appshell may process native // events (if not in performance mode), which can result in suppressing the // next thread event for at most this many ticks: -#define THREAD_EVENT_STARVATION_LIMIT PR_MillisecondsToInterval(10) +#define THREAD_EVENT_STARVATION_LIMIT PR_MillisecondsToInterval(20) NS_IMPL_ISUPPORTS3(nsBaseAppShell, nsIAppShell, nsIThreadObserver, nsIObserver) @@ -246,9 +246,8 @@ nsBaseAppShell::OnProcessNextEvent(nsIThreadInternal *thr, bool mayWait, // Reset prior to invoking DoProcessNextNativeEvent which might cause // NativeEventCallback to process gecko events. mProcessedGeckoEvents = false; - PRIntervalTime start = PR_IntervalNow(); - while (DoProcessNextNativeEvent(false, recursionDepth) && - (PR_IntervalNow() - start) < THREAD_EVENT_STARVATION_LIMIT); + + DoProcessNextNativeEvent(false, recursionDepth); while (!NS_HasPendingEvents(thr) && !mProcessedGeckoEvents) { // If we have been asked to exit from Run, then we should not wait for