UserGestureIndicator is a mess. Clean it up.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2276 matching lines @@
     AtomicString eventType;
     switch (inputEvent.type) {
       case WebInputEvent::MouseMove:
         eventType = EventTypeNames::mousemove;
         break;
       case WebInputEvent::MouseLeave:
         eventType = EventTypeNames::mouseout;
         break;
       case WebInputEvent::MouseDown:
         eventType = EventTypeNames::mousedown;
-        gestureIndicator = wrapUnique(
-            new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
+        gestureIndicator = wrapUnique(new UserGestureIndicator(
+            UserGestureToken::create(UserGestureToken::NewGesture)));
         m_mouseCaptureGestureToken = gestureIndicator->currentToken();
         break;
       case WebInputEvent::MouseUp:
         eventType = EventTypeNames::mouseup;
         gestureIndicator = wrapUnique(
             new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
         break;
       default:
         NOTREACHED();
     }
@@ skipping 152 matching lines @@
   }
 
   // A keypress event is canceled. If an ongoing composition exists, then the
   // keydown event should have arisen from a handled key (e.g., backspace).
   // In this case we ignore the cancellation and continue; otherwise (no
   // ongoing composition) we exit and signal success only for attempts to
   // clear the composition.
   if (m_suppressNextKeypressEvent && !inputMethodController.hasComposition())
     return text.isEmpty();
 
-  UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+  UserGestureIndicator gestureIndicator(
+      UserGestureToken::create(UserGestureToken::NewGesture));
 
   // When the range of composition underlines overlap with the range between
   // selectionStart and selectionEnd, WebKit somehow won't paint the selection
   // at all (see InlineTextBox::paint() function in InlineTextBox.cpp).
   // But the selection range actually takes effect.
   inputMethodController.setComposition(
       String(text), CompositionUnderlineVectorBuilder(underlines),
       selectionStart, selectionEnd);
 
   return text.isEmpty() || inputMethodController.hasComposition();
@@ skipping 10 matching lines @@
   if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
     return plugin->finishComposingText(selectionBehavior);
 
   return focused->inputMethodController().finishComposingText(
       selectionBehavior == KeepSelection
           ? InputMethodController::KeepSelection
           : InputMethodController::DoNotKeepSelection);
 }
 
 bool WebViewImpl::commitText(const WebString& text, int relativeCaretPosition) {
-  UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+  UserGestureIndicator gestureIndicator(
+      UserGestureToken::create(UserGestureToken::NewGesture));
 
   LocalFrame* focused = focusedLocalFrameAvailableForIme();
   if (!focused)
     return false;
 
   if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
     return plugin->commitText(text, relativeCaretPosition);
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
@@ skipping 1357 matching lines @@
   if (m_dragOperation ==
       WebDragOperationNone) {  // IPC RACE CONDITION: do not allow this drop.
     dragTargetDragLeave();
     return;
   }
 
   m_currentDragData->setModifiers(modifiers);
   DragData dragData(m_currentDragData.get(), pointInRootFrame, screenPoint,
                     static_cast<DragOperation>(m_operationsAllowed));
 
-  UserGestureIndicator gesture(DefinitelyProcessingNewUserGesture);
+  UserGestureIndicator gesture(
+      UserGestureToken::create(UserGestureToken::NewGesture));
   m_page->dragController().performDrag(&dragData);
 
   m_dragOperation = WebDragOperationNone;
   m_currentDragData = nullptr;
 }
 
 void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers) {
   Vector<uint32_t> result;
   for (Frame* frame = m_page->mainFrame(); frame;
        frame = frame->tree().traverseNext()) {
@@ skipping 775 matching lines @@
   if (m_layerTreeView)
     m_layerTreeView->setVisible(isVisible);
 }
 
 void WebViewImpl::pointerLockMouseEvent(const WebInputEvent& event) {
   std::unique_ptr<UserGestureIndicator> gestureIndicator;
   AtomicString eventType;
   switch (event.type) {
     case WebInputEvent::MouseDown:
       eventType = EventTypeNames::mousedown;
-      gestureIndicator = wrapUnique(
-          new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
+      gestureIndicator = wrapUnique(new UserGestureIndicator(
+          UserGestureToken::create(UserGestureToken::NewGesture)));
       m_pointerLockGestureToken = gestureIndicator->currentToken();
       break;
     case WebInputEvent::MouseUp:
       eventType = EventTypeNames::mouseup;
       gestureIndicator = wrapUnique(
           new UserGestureIndicator(m_pointerLockGestureToken.release()));
       break;
     case WebInputEvent::MouseMove:
       eventType = EventTypeNames::mousemove;
       break;
@@ skipping 55 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink