Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Unified Diff: trunk/Source/core/frame/DOMTimer.cpp

Issue 264333002: Revert 172810 "Add a "forwarded" flag to usergesture tokens." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
« no previous file with comments | « trunk/LayoutTests/fast/events/popup-forwarded-postmessage-blocked-expected.txt ('k') | trunk/Source/core/frame/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698