diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/dom/UserGestureIndicator.cpp | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/dom/UserGestureIndicator.cpp')
| -rw-r--r-- | WebCore/dom/UserGestureIndicator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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() |