Merge 145481

Source/WebCore/dom/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 41 matching lines @@
     {
     }
 
     size_t m_consumableGestures;
 };
 
 }
 
 static bool isDefinite(ProcessingUserGestureState state)
 {
-    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyNotProcessingUserGesture;
+    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
 }
 
 ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
 UserGestureIndicator* UserGestureIndicator::s_topmostIndicator = 0;
 
 UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state)
     : m_previousState(s_state)
 {
     // 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)
         static_cast<GestureToken*>(m_token.get())->addGesture();
+    else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this)
+        static_cast<GestureToken*>(m_token.get())->addGesture();
     ASSERT(isDefinite(s_state));
 }
 
 UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureIndicator::Token> token)
     : m_previousState(s_state)
 {
     if (token && static_cast<GestureToken*>(token.get())->hasGestures()) {
         if (!s_topmostIndicator) {
             s_topmostIndicator = this;
             m_token = token;
         } else {
             m_token = s_topmostIndicator->currentToken();
             static_cast<GestureToken*>(m_token.get())->addGesture();
             static_cast<GestureToken*>(token.get())->consumeGesture();
         }
-        s_state = DefinitelyProcessingNewUserGesture;
+        s_state = DefinitelyProcessingUserGesture;
     }
 
     ASSERT(isDefinite(s_state));
 }
 
 UserGestureIndicator::~UserGestureIndicator()
 {
     s_state = m_previousState;
     if (s_topmostIndicator == this)
         s_topmostIndicator = 0;
     ASSERT(isDefinite(s_state));
 }
 
 bool UserGestureIndicator::processingUserGesture()
 {
-    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && s_state == DefinitelyProcessingNewUserGesture;
+    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && (s_state == DefinitelyProcessingNewUserGesture || s_state == DefinitelyProcessingUserGesture);
 }
 
 bool UserGestureIndicator::consumeUserGesture()
 {
     if (!s_topmostIndicator)
         return false;
     return static_cast<GestureToken*>(s_topmostIndicator->currentToken())->consumeGesture();
 }
 
 UserGestureIndicator::Token* UserGestureIndicator::currentToken()
 {
     if (!s_topmostIndicator)
         return 0;
     return s_topmostIndicator->m_token.get();
 }
 
 }