Fixes in UserGestureIndicator

Source/platform/UserGestureIndicator.cpp

 /*
  * Copyright (C) 2010 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 112 matching lines @@
 
     // We overwrite s_state only if the caller is definite about the gesture state.
     if (isDefinite(state)) {
         if (!s_topmostIndicator) {
             s_topmostIndicator = this;
             m_token = GestureToken::create();
         } else {
             m_token = s_topmostIndicator->currentToken();
         }
         s_state = state;
-        if (state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture)
-            s_processedUserGestureInPast = true;
     }
 
-    if (state == DefinitelyProcessingNewUserGesture)
+    if (state == DefinitelyProcessingNewUserGesture) {
         static_cast<GestureToken*>(m_token.get())->addGesture();
-    else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this)
+        s_processedUserGestureInPast = true;
+    } else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this) {
         static_cast<GestureToken*>(m_token.get())->addGesture();
+        s_processedUserGestureInPast = true;
+    }
     ASSERT(isDefinite(s_state));
 }
 
 UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token)
     : m_previousState(s_state)
 {
     // Silently ignore UserGestureIndicators on non-main threads.
     if (!isMainThread())
         return;
 
     if (token) {
         static_cast<GestureToken*>(token.get())->resetTimestamp();
         if (!s_topmostIndicator) {
             s_topmostIndicator = this;
             m_token = token;
         } else {
             m_token = s_topmostIndicator->currentToken();
             if (static_cast<GestureToken*>(token.get())->hasGestures()) {
+                s_processedUserGestureInPast = true;

[jochen (gone - plz use gerrit), 2014/04/17 08:25:38]

here we're not really adding a gesture, we're just moving it from one token to
another

[vabr (Chromium), 2014/04/17 13:55:56]

Good point, I will remove the line.
The flag was flipped to true during the original creation of the token, which
only happens in the other UserGestureIndicator constructor (if I can trust Code
Search). That means the flag was flipped there already.

                 static_cast<GestureToken*>(m_token.get())->addGesture();
                 static_cast<GestureToken*>(token.get())->consumeGesture();
             }
         }
         s_state = DefinitelyProcessingUserGesture;
-        s_processedUserGestureInPast = true;
     }
 
     ASSERT(isDefinite(s_state));
 }
 
 UserGestureIndicator::~UserGestureIndicator()
 {
     if (!isMainThread())
         return;
     s_state = m_previousState;
@@ skipping 19 matching lines @@
 UserGestureToken* UserGestureIndicator::currentToken()
 {
     if (!isMainThread() || !s_topmostIndicator)
         return 0;
     return s_topmostIndicator->m_token.get();
 }
 
 void UserGestureIndicator::clearProcessedUserGestureInPast()
 {
     if (isMainThread())
-        s_processedUserGestureInPast = true;
+        s_processedUserGestureInPast = false;
 }
 
 bool UserGestureIndicator::processedUserGestureInPast()
 {
     if (!isMainThread())
         return false;
     return s_processedUserGestureInPast;
 }
 
 UserGestureIndicatorDisabler::UserGestureIndicatorDisabler()
     : m_savedState(UserGestureIndicator::s_state)
     , m_savedIndicator(UserGestureIndicator::s_topmostIndicator)
 {
     RELEASE_ASSERT(isMainThread());
     UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
     UserGestureIndicator::s_topmostIndicator = 0;
 }
 
 UserGestureIndicatorDisabler::~UserGestureIndicatorDisabler()
 {
     RELEASE_ASSERT(isMainThread());
     UserGestureIndicator::s_state = m_savedState;
     UserGestureIndicator::s_topmostIndicator = m_savedIndicator;
 }
 
 }