Changeset 145481 in webkit

Timestamp:

Mar 11, 2013 10:45:19 PM (11 years ago)

Author:

jochen@chromium.org

Message:

Don't create multiple user gesture indicators when forwarding events to sub frames
​https://bugs.webkit.org/show_bug.cgi?id=111923

Reviewed by Adam Barth.

Ports that implement consumable user gestures depend on a single user
gesture indicator being created in response to a single user gesture.

Source/WebCore:

Test: platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes.html

• dom/UserGestureIndicator.cpp:

(WebCore::isDefinite):
(WebCore::UserGestureIndicator::UserGestureIndicator):
(WebCore::UserGestureIndicator::processingUserGesture):

• dom/UserGestureIndicator.h:
• page/EventHandler.cpp:

(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::handleMouseDoubleClickEvent):
(WebCore::EventHandler::handleMouseReleaseEvent):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::handleTouchEvent):

LayoutTests:

• platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes-expected.txt: Added.
• platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes-expected.txt (added)
• LayoutTests/platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/UserGestureIndicator.cpp (modified) (4 diffs)
• Source/WebCore/dom/UserGestureIndicator.h (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-11  Jochen Eisinger  <jochen@chromium.org>
+
+        Don't create multiple user gesture indicators when forwarding events to sub frames
+        https://bugs.webkit.org/show_bug.cgi?id=111923
+
+        Reviewed by Adam Barth.
+
+        Ports that implement consumable user gestures depend on a single user
+        gesture indicator being created in response to a single user gesture.
+
+        * platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes-expected.txt: Added.
+        * platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes.html: Added.
+
 2013-03-11  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Jochen Eisinger  <jochen@chromium.org>
+
+        Don't create multiple user gesture indicators when forwarding events to sub frames
+        https://bugs.webkit.org/show_bug.cgi?id=111923
+
+        Reviewed by Adam Barth.
+
+        Ports that implement consumable user gestures depend on a single user
+        gesture indicator being created in response to a single user gesture.
+
+        Test: platform/chromium/fast/events/popup-allowed-from-gesture-only-once-iframes.html
+
+        * dom/UserGestureIndicator.cpp:
+        (WebCore::isDefinite):
+        (WebCore::UserGestureIndicator::UserGestureIndicator):
+        (WebCore::UserGestureIndicator::processingUserGesture):
+        * dom/UserGestureIndicator.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseDoubleClickEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        (WebCore::EventHandler::keyEvent):
+        (WebCore::EventHandler::handleTouchEvent):
+
 2013-03-11  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/UserGestureIndicator.cpp

@@ -60 +60 @@
 static bool isDefinite(ProcessingUserGestureState state)
 {
-    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyNotProcessingUserGesture;
+    return state == DefinitelyProcessingNewUserGesture || state == DefinitelyProcessingUserGesture || state == DefinitelyNotProcessingUserGesture;
 }
 
@@ -81 +81 @@
     if (state == DefinitelyProcessingNewUserGesture)
         static_cast<GestureToken*>(m_token.get())->addGesture();
+    else if (state == DefinitelyProcessingUserGesture && s_topmostIndicator == this)
+        static_cast<GestureToken*>(m_token.get())->addGesture();
     ASSERT(isDefinite(s_state));
 }
@@ -96 +98 @@
             static_cast<GestureToken*>(token.get())->consumeGesture();
         }
-        s_state = DefinitelyProcessingNewUserGesture;
+        s_state = DefinitelyProcessingUserGesture;
     }
 
@@ -112 +114 @@
 bool UserGestureIndicator::processingUserGesture()
 {
-    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && s_state == DefinitelyProcessingNewUserGesture;
+    return s_topmostIndicator && static_cast<GestureToken*>(s_topmostIndicator->currentToken())->hasGestures() && (s_state == DefinitelyProcessingNewUserGesture || s_state == DefinitelyProcessingUserGesture);
 }
 

trunk/Source/WebCore/dom/UserGestureIndicator.h

@@ -35 +35 @@
 enum ProcessingUserGestureState {
     DefinitelyProcessingNewUserGesture,
+    DefinitelyProcessingUserGesture,
     PossiblyProcessingUserGesture,
     DefinitelyNotProcessingUserGesture

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1455 +1455 @@
 #endif
 
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
     m_lastMouseDownUserGestureToken = gestureIndicator.currentToken();
 
@@ -1589 +1589 @@
     m_frame->selection()->setCaretBlinkingSuspended(false);
 
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
 
     // We get this instead of a second mouse-up 
@@ -1832 +1832 @@
         gestureIndicator = adoptPtr(new UserGestureIndicator(m_lastMouseDownUserGestureToken.release()));
     else
-        gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
+        gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture));
 
 #if ENABLE(PAN_SCROLLING)
@@ -3157 +3157 @@
         return false;
 
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
     UserTypingGestureIndicator typingGestureIndicator(m_frame);
 
@@ -3854 +3854 @@
     const Vector<PlatformTouchPoint>& points = event.touchPoints();
 
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
 
     unsigned i;