Index: third_party/WebKit/Source/core/loader/NavigationScheduler.cpp |
diff --git a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp |
index b33d21493967ed0059abfd29dba13408abff5137..20c17d4800909b83f26b8d1ff6e6c8df3494b4c3 100644 |
--- a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp |
+++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp |
@@ -64,7 +64,7 @@ public: |
, m_originDocument(originDocument) |
, m_replacesCurrentItem(replacesCurrentItem) |
, m_isLocationChange(isLocationChange) |
- , m_wasUserGesture(UserGestureIndicator::processingUserGesture()) |
+ , m_wasUserGesture(UserGestureIndicator::processingUserGestureUntracked()) |
{ |
if (m_wasUserGesture) |
m_userGestureToken = UserGestureIndicator::currentToken(); |
@@ -306,7 +306,7 @@ bool NavigationScheduler::mustReplaceCurrentItem(LocalFrame* targetFrame) |
{ |
// Non-user navigation before the page has finished firing onload should not create a new back/forward item. |
// See https://webkit.org/b/42861 for the original motivation for this. |
- if (!UserGestureIndicator::processingUserGesture() && !targetFrame->document()->loadEventFinished()) |
+ if (!targetFrame->document()->loadEventFinished() && !UserGestureIndicator::processingUserGesture()) |
return true; |
// Navigation of a subframe during loading of an ancestor frame does not create a new back/forward item. |