Move persistent gesture state to Document, add DocumentUserGestureToken

third_party/WebKit/Source/core/input/GestureManager.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/GestureManager.h"
 
 #include "core/dom/Document.h"
+#include "core/dom/DocumentUserGestureToken.h"
 #include "core/editing/SelectionController.h"
 #include "core/events/GestureEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/input/EventHandler.h"
 #include "core/input/EventHandlingUtil.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
@@ skipping 114 matching lines @@
 
 WebInputEventResult GestureManager::handleGestureTap(
     const GestureEventWithHitTestResults& targetedEvent) {
   FrameView* frameView(m_frame->view());
   const PlatformGestureEvent& gestureEvent = targetedEvent.event();
   HitTestRequest::HitTestRequestType hitType =
       getHitTypeForGestureType(gestureEvent.type());
   uint64_t preDispatchDomTreeVersion = m_frame->document()->domTreeVersion();
   uint64_t preDispatchStyleVersion = m_frame->document()->styleVersion();
 
-  UserGestureIndicator gestureIndicator(UserGestureToken::create());
-
   HitTestResult currentHitTest = targetedEvent.hitTestResult();
 
   // We use the adjusted position so the application isn't surprised to see a
   // event with co-ordinates outside the target's bounds.
   IntPoint adjustedPoint =
       frameView->rootFrameToContents(gestureEvent.position());
 
   const unsigned modifiers = gestureEvent.getModifiers();
 
   if (!m_suppressMouseEventsFromGestures) {
@@ skipping 22 matching lines @@
       mainFrame->view()->updateLifecycleToCompositingCleanPlusScrolling();
     adjustedPoint = frameView->rootFrameToContents(gestureEvent.position());
     currentHitTest = EventHandlingUtil::hitTestResultInFrame(
         m_frame, adjustedPoint, hitType);
   }
 
   // Capture data for showUnhandledTapUIIfNeeded.
   Node* tappedNode = currentHitTest.innerNode();
   IntPoint tappedPosition = gestureEvent.position();
   Node* tappedNonTextNode = tappedNode;
+  UserGestureIndicator gestureIndicator(DocumentUserGestureToken::create(
+      tappedNode ? &tappedNode->document() : nullptr));
 
   if (tappedNonTextNode && tappedNonTextNode->isTextNode())
     tappedNonTextNode = FlatTreeTraversal::parent(*tappedNonTextNode);
 
   m_mouseEventManager->setClickNode(tappedNonTextNode);
 
   PlatformMouseEvent fakeMouseDown(
       gestureEvent.position(), gestureEvent.globalPosition(),
       WebPointerProperties::Button::Left, PlatformEvent::MousePressed,
       gestureEvent.tapCount(), static_cast<PlatformEvent::Modifiers>(
@@ skipping 222 matching lines @@
     return nullptr;
 
   return &m_frame->page()->frameHost();
 }
 
 double GestureManager::getLastShowPressTimestamp() const {
   return m_lastShowPressTimestamp;
 }
 
 }  // namespace blink