Changeset 148672 in webkit

Timestamp:

Apr 18, 2013 6:37:24 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

Unset :hover in inner documents
​https://bugs.webkit.org/show_bug.cgi?id=114446

Reviewed by Antonio Gomes.

Source/WebCore:

Fixes a regression from r145126 where hover nodes in inner documents was sometimes
not unset. Additionally it uses the new api from r145126 to avoid an unnecessary
hit test in touch-event handling.

Test: fast/events/touch/frame-hover-update.html

• dom/Document.cpp:

(WebCore::Document::updateHoverActiveState):

• page/EventHandler.cpp:

(WebCore::shouldGesturesTriggerActive):
(WebCore::EventHandler::handleTouchEvent):

LayoutTests:

Test expected effect of touch events on hover state.

• fast/events/touch/frame-hover-update-expected.txt: Added.
• fast/events/touch/frame-hover-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/frame-hover-update-expected.txt (added)
• LayoutTests/fast/events/touch/frame-hover-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-18  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Unset :hover in inner documents
+        https://bugs.webkit.org/show_bug.cgi?id=114446
+
+        Reviewed by Antonio Gomes.
+
+        Test expected effect of touch events on hover state.
+
+        * fast/events/touch/frame-hover-update-expected.txt: Added.
+        * fast/events/touch/frame-hover-update.html: Added.
+
 2013-04-18  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-18  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Unset :hover in inner documents
+        https://bugs.webkit.org/show_bug.cgi?id=114446
+
+        Reviewed by Antonio Gomes.
+
+        Fixes a regression from r145126 where hover nodes in inner documents was sometimes
+        not unset. Additionally it uses the new api from r145126 to avoid an unnecessary
+        hit test in touch-event handling.
+
+        Test: fast/events/touch/frame-hover-update.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateHoverActiveState):
+        * page/EventHandler.cpp:
+        (WebCore::shouldGesturesTriggerActive):
+        (WebCore::EventHandler::handleTouchEvent):
+
 2013-04-18  Seokju Kwon  <seokju.kwon@gmail.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5982 +5982 @@
                 nodesToRemoveFromChain.append(curr->node());
         }
+        // Unset hovered nodes in sub frame documents if the old hovered node was a frame owner.
+        if (oldHoverNode && oldHoverNode->isFrameOwnerElement()) {
+            if (Document* contentDocument = toFrameOwnerElement(oldHoverNode.get())->contentDocument())
+                contentDocument->updateHoverActiveState(request, 0);
+        }
     }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -282 +282 @@
 }
 
-#if ENABLE(GESTURE_EVENTS)
 static inline bool shouldGesturesTriggerActive()
 {
@@ -290 +289 @@
     return false;
 }
-#endif
 
 #if !PLATFORM(MAC)
@@ -3933 +3931 @@
         }
 
-#if ENABLE(GESTURE_EVENTS)
         if (shouldGesturesTriggerActive())
             hitType |= HitTestRequest::ReadOnly;
-#endif
 
         // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
@@ -3976 +3972 @@
             touchTarget = node;
         } else if (pointState == PlatformTouchPoint::TouchReleased || pointState == PlatformTouchPoint::TouchCancelled) {
-            // We only perform a hittest on release or cancel to unset :active or :hover state.
-            if (touchPointTargetKey == m_originatingTouchPointTargetKey) {
-                hitTestResultAtPoint(pagePoint, hitType);
+            // No need to perform a hit-test since we only need to unset :hover and :active states.
+            if (!shouldGesturesTriggerActive() && allTouchReleased)
+                m_frame->document()->updateHoverActiveState(hitType, 0);
+            if (touchPointTargetKey == m_originatingTouchPointTargetKey)
                 m_originatingTouchPointTargetKey = 0;
-            } else if (m_originatingTouchPointDocument.get() && m_originatingTouchPointDocument->frame()) {
-                LayoutPoint pagePointInOriginatingDocument = documentPointForWindowPoint(m_originatingTouchPointDocument->frame(), point.pos());
-                hitTestResultInFrame(m_originatingTouchPointDocument->frame(), pagePointInOriginatingDocument, hitType);
-            }
+
             // The target should be the original target for this touch, so get it from the hashmap. As it's a release or cancel
             // we also remove it from the map.