| Index: trunk/Source/core/frame/DOMTimer.cpp
|
| ===================================================================
|
| --- trunk/Source/core/frame/DOMTimer.cpp (revision 173444)
|
| +++ trunk/Source/core/frame/DOMTimer.cpp (working copy)
|
| @@ -53,8 +53,7 @@
|
| {
|
| return UserGestureIndicator::processingUserGesture()
|
| && interval <= maxIntervalForUserGestureForwarding
|
| - && nestingLevel == 1
|
| - && !UserGestureIndicator::currentToken()->wasForwarded();
|
| + && nestingLevel == 1; // Gestures should not be forwarded to nested timers.
|
| }
|
|
|
| double DOMTimer::hiddenPageAlignmentInterval()
|
| @@ -123,8 +122,6 @@
|
| timerNestingLevel = m_nestingLevel;
|
| ASSERT(!context->activeDOMObjectsAreSuspended());
|
| // Only the first execution of a multi-shot timer should get an affirmative user gesture indicator.
|
| - if (m_userGestureToken)
|
| - m_userGestureToken->setForwarded();
|
| UserGestureIndicator gestureIndicator(m_userGestureToken.release());
|
|
|
| TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerFire", "data", InspectorTimerFireEvent::data(context, m_timeoutID));
|
|
|