Merge 145453

Source/WebCore/dom/UserGestureIndicator.h

 /*
  * 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 15 matching lines @@
 #ifndef UserGestureIndicator_h
 #define UserGestureIndicator_h
 
 #include <wtf/Noncopyable.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 enum ProcessingUserGestureState {
-    DefinitelyProcessingUserGesture,
+    DefinitelyProcessingNewUserGesture,
     PossiblyProcessingUserGesture,
     DefinitelyNotProcessingUserGesture
 };
 
 class UserGestureIndicator {
     WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
 public:
     class Token : public RefCounted<Token> {
     public:
         virtual ~Token() { }
@@ skipping 11 matching lines @@
 private:
     static ProcessingUserGestureState s_state;
     static UserGestureIndicator* s_topmostIndicator;
     ProcessingUserGestureState m_previousState;
     RefPtr<Token> m_token;
 };
 
 }
 
 #endif