Move persistent gesture state to Document, add DocumentUserGestureToken

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 65e9ac9a3c572fea1623484eeae2493b80234854..6b20b048b8861b21a2b09b1b9405b9dc2f71d8bb 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -395,7 +395,7 @@ void FrameLoader::setHistoryItemStateForCommit(
     HistoryNavigationType navigationType) {
   if (m_frame->settings()->historyEntryRequiresUserGesture() &&
       historyCommitType == StandardCommit)
-    UserGestureIndicator::clearProcessedUserGestureSinceLoad();
+    m_frame->document()->clearHasReceivedUserGesture();

[Nate Chapin, 2016/10/21 18:11:04]

I moved this to updateForSameDocumentNavigation(). It was here so it would catch
both same and different document navigations, but if there's a new Document, we
don't need to reset state.

 
   HistoryItem* oldItem = m_currentItem;
   if (isBackForwardLoadType(loadType) && m_provisionalItem)
@@ -790,9 +790,9 @@ void FrameLoader::updateForSameDocumentNavigation(
   if (!m_currentItem)
     historyCommitType = HistoryInertCommit;
   if (m_frame->settings()->historyEntryRequiresUserGesture() &&
-      !UserGestureIndicator::processedUserGestureSinceLoad() &&
-      initiatingDocument)
+      initiatingDocument && !initiatingDocument->hasReceivedUserGesture()) {
     historyCommitType = HistoryInertCommit;
+  }
 
   setHistoryItemStateForCommit(
       type, historyCommitType,
@@ -937,8 +937,8 @@ FrameLoadType FrameLoader::determineFrameLoadType(
     return FrameLoadTypeReload;
 
   if (m_frame->settings()->historyEntryRequiresUserGesture() &&
-      !UserGestureIndicator::processedUserGestureSinceLoad() &&
-      request.originDocument())
+      request.originDocument() &&
+      !request.originDocument()->hasReceivedUserGesture())
     return FrameLoadTypeReplaceCurrentItem;
 
   return FrameLoadTypeStandard;