Backed out changeset 5297eafc36e2 (bug 962911) for making B2G reftests much more failure-prone.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-01-23 11:50:52 -05:00
Родитель 0ac657796f
Коммит 154c073fb8
1 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -14,7 +14,7 @@
// When processing the next thread event, the appshell may process native // When processing the next thread event, the appshell may process native
// events (if not in performance mode), which can result in suppressing the // events (if not in performance mode), which can result in suppressing the
// next thread event for at most this many ticks: // 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) 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 // Reset prior to invoking DoProcessNextNativeEvent which might cause
// NativeEventCallback to process gecko events. // NativeEventCallback to process gecko events.
mProcessedGeckoEvents = false; mProcessedGeckoEvents = false;
PRIntervalTime start = PR_IntervalNow();
while (DoProcessNextNativeEvent(false, recursionDepth) && DoProcessNextNativeEvent(false, recursionDepth);
(PR_IntervalNow() - start) < THREAD_EVENT_STARVATION_LIMIT);
while (!NS_HasPendingEvents(thr) && !mProcessedGeckoEvents) { while (!NS_HasPendingEvents(thr) && !mProcessedGeckoEvents) {
// If we have been asked to exit from Run, then we should not wait for // If we have been asked to exit from Run, then we should not wait for