Merge 145453

Source/WebCore/dom/UserGestureIndicator.cpp

Index: Source/WebCore/dom/UserGestureIndicator.cpp
===================================================================
--- Source/WebCore/dom/UserGestureIndicator.cpp	(revision 146131)
+++ Source/WebCore/dom/UserGestureIndicator.cpp	(working copy)
@@ -59,7 +59,7 @@
 
 static bool isDefinite(ProcessingUserGestureState state)
 {
-    return state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
+    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyNotProcessingUserGesture;
 }
 
 ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
@@ -78,7 +78,7 @@
         s_state = state;
     }
 
-    if (state == DefinitelyProcessingUserGesture)
+    if (state == DefinitelyProcessingNewUserGesture)
         static_cast<GestureToken*>(m_token.get())->addGesture();
     ASSERT(isDefinite(s_state));
 }
@@ -95,7 +95,7 @@
             static_cast<GestureToken*>(m_token.get())->addGesture();
             static_cast<GestureToken*>(token.get())->consumeGesture();
         }
-        s_state = DefinitelyProcessingUserGesture;
+        s_state = DefinitelyProcessingNewUserGesture;
     }
 
     ASSERT(isDefinite(s_state));
@@ -111,7 +111,7 @@
 
 bool UserGestureIndicator::processingUserGesture()
 {
-    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && s_state == DefinitelyProcessingUserGesture;
+    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && s_state == DefinitelyProcessingNewUserGesture;
 }
 
 bool UserGestureIndicator::consumeUserGesture()