Stricter user gestures for touch - measure and warn

third_party/WebKit/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 110 matching lines @@
 {
     return state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture;
 }
 
 } // namespace
 
 ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
 UserGestureIndicator* UserGestureIndicator::s_topmostIndicator = 0;
 bool UserGestureIndicator::s_processedUserGestureSinceLoad = false;
 
-UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state)
+UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state, UserGestureUsedCallback* usageCallback)
     : m_previousState(DefinitelyNotProcessingUserGesture)
+    , m_usageCallback(usageCallback)
 {
     // Silently ignore UserGestureIndicators on non-main threads.
     if (!isMainThread())
         return;
 
     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 = currentToken();
         }
         s_state = state;
     }
 
     if (state == DefinitelyProcessingNewUserGesture) {
         static_cast<GestureToken*>(m_token.get())->addGesture();
         s_processedUserGestureSinceLoad = true;
     } else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this) {
         static_cast<GestureToken*>(m_token.get())->addGesture();
         s_processedUserGestureSinceLoad = true;
     }
     ASSERT(isDefinite(s_state));
 }
 
-UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token)
+UserGestureIndicator::UserGestureIndicator(PassRefPtr<UserGestureToken> token, UserGestureUsedCallback* usageCallback)
     : m_previousState(DefinitelyNotProcessingUserGesture)
+    , m_usageCallback(usageCallback)
 {
     // Silently ignore UserGestureIndicators on non-main threads.
     if (!isMainThread())
         return;
 
     m_previousState = s_state;
 
     if (token) {
         static_cast<GestureToken*>(token.get())->resetTimestamp();
         if (!s_topmostIndicator) {
@@ skipping 18 matching lines @@
         return;
     s_state = m_previousState;
     if (s_topmostIndicator == this)
         s_topmostIndicator = nullptr;
     ASSERT(isDefinite(s_state));
 }
 
 // static
 bool UserGestureIndicator::processingUserGesture()
 {
+    if (UserGestureIndicator::processingUserGestureUntracked()) {
+        if (s_topmostIndicator->m_usageCallback) {
+            s_topmostIndicator->m_usageCallback->userGestureUsed();
+            s_topmostIndicator->m_usageCallback = nullptr;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool UserGestureIndicator::processingUserGestureUntracked()
+{
     if (auto* token = currentToken()) {
         ASSERT(isMainThread());
         return isDefiniteUserGesture(s_state) && static_cast<GestureToken*>(token)->hasGestures();
     }
 
     return false;
 }
 
 // static
 bool UserGestureIndicator::consumeUserGesture()
 {
     if (auto* token = currentToken()) {
         ASSERT(isMainThread());
-        return static_cast<GestureToken*>(token)->consumeGesture();
+        if (static_cast<GestureToken*>(token)->consumeGesture()) {
+            if (s_topmostIndicator->m_usageCallback) {
+                s_topmostIndicator->m_usageCallback->userGestureUsed();
+                s_topmostIndicator->m_usageCallback = nullptr;
+            }
+            return true;
+        }
     }
-
     return false;
 }
 
 // static
 UserGestureToken* UserGestureIndicator::currentToken()
 {
     if (!isMainThread() || !s_topmostIndicator)
         return nullptr;
     return s_topmostIndicator->m_token.get();
 }
 
 // static
 void UserGestureIndicator::clearProcessedUserGestureSinceLoad()
 {
     if (isMainThread())
         s_processedUserGestureSinceLoad = false;
 }
 
 // static
 bool UserGestureIndicator::processedUserGestureSinceLoad()
 {
     if (!isMainThread())
         return false;
     return s_processedUserGestureSinceLoad;
 }
 
 } // namespace blink