[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 98d569aab8225b997411e878db4bb77fb72d10e2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 17:03:33 2010 +0000

    2010-01-13  Ben Murdoch  <benm at google.com>
    
            Reviewed by Simon Hausmann.
    
            [Android] [Qt] The JSC ScriptController does not consider Touch Events user gestures.
            https://bugs.webkit.org/show_bug.cgi?id=33597
    
            * bindings/js/ScriptController.cpp:
            (WebCore::ScriptController::processingUserGestureEvent): Add the touch event types (touchstart, touchmove and touchend) to the set of events that are considered user gestures.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b4faec6..47f7e28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-13  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Android] [Qt] The JSC ScriptController does not consider Touch Events user gestures.
+        https://bugs.webkit.org/show_bug.cgi?id=33597
+
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::processingUserGestureEvent): Add the touch event types (touchstart, touchmove and touchend) to the set of events that are considered user gestures.
+
 2010-01-13  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Rubber-stamped by Tor Arne Vestbø.
diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp
index 6673eac..0aa7a5a 100644
--- a/WebCore/bindings/js/ScriptController.cpp
+++ b/WebCore/bindings/js/ScriptController.cpp
@@ -247,6 +247,11 @@ bool ScriptController::processingUserGestureEvent() const
             // keyboard events
             || type == eventNames().keydownEvent || type == eventNames().keypressEvent
             || type == eventNames().keyupEvent
+#if ENABLE(TOUCH_EVENTS)
+            // touch events
+            || type == eventNames().touchstartEvent || type == eventNames().touchmoveEvent
+            || type == eventNames().touchendEvent
+#endif
             // other accepted events
             || type == eventNames().selectEvent || type == eventNames().changeEvent
             || type == eventNames().focusEvent || type == eventNames().blurEvent

-- 
WebKit Debian packaging