Merge 126609

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 16 matching lines @@
 #include "UserGestureIndicator.h"
 
 namespace WebCore {
 
 static bool isDefinite(ProcessingUserGestureState state)
 {
     return state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
 }
 
 ProcessingUserGestureState UserGestureIndicator::s_state = DefinitelyNotProcessingUserGesture;
+size_t UserGestureIndicator::s_consumableGestures = 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))
         s_state = state;
+
+    if (s_state == DefinitelyProcessingUserGesture)
+        s_consumableGestures++;
     ASSERT(isDefinite(s_state));
 }
 
 UserGestureIndicator::~UserGestureIndicator()
 {
+    if (s_consumableGestures && s_state == DefinitelyProcessingUserGesture)
+        s_consumableGestures--;
     s_state = m_previousState;
     ASSERT(isDefinite(s_state));
 }
 
+bool UserGestureIndicator::consumeUserGesture()
+{
+    if (!s_consumableGestures)
+        return false;
+    s_consumableGestures--;
+    return true;
 }
+
+}