From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebCore/dom/UserGestureIndicator.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'WebCore/dom/UserGestureIndicator.cpp')

diff --git a/WebCore/dom/UserGestureIndicator.cpp b/WebCore/dom/UserGestureIndicator.cpp
index 9fb30d3..06a3831 100644
--- a/WebCore/dom/UserGestureIndicator.cpp
+++ b/WebCore/dom/UserGestureIndicator.cpp
@@ -28,13 +28,12 @@
 
 namespace WebCore {
 
-bool UserGestureIndicator::s_processingUserGesture = false;
+ProcessingUserGestureState UserGestureIndicator::s_processingUserGesture = PossiblyProcessingUserGesture;
 
 UserGestureIndicator::UserGestureIndicator(ProcessingUserGestureState state)
     : m_previousValue(s_processingUserGesture)
 {
-    if (state == DefinitelyProcessingUserGesture)
-        s_processingUserGesture = true;
+    s_processingUserGesture = state;
 }
 
 UserGestureIndicator::~UserGestureIndicator()
-- 
cgit v1.1