Diff
Modified: trunk/LayoutTests/ChangeLog (164494 => 164495)
--- trunk/LayoutTests/ChangeLog 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/ChangeLog 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,3 +1,19 @@
+2014-02-21 Benjamin Poulain <bpoul...@apple.com>
+
+ 'mouseenter' mouse compat event not fired when listeners for touch events
+ https://bugs.webkit.org/show_bug.cgi?id=128534
+
+ Reviewed by Andreas Kling.
+
+ The existing tests for mouseenter/mouseleave had very poor readability which made them
+ useless for debugging.
+ This updates them to log what cause the events, and log all the events everywhere on the page.
+
+ * fast/events/mouseenter-mouseleave-capture-expected.txt:
+ * fast/events/mouseenter-mouseleave-capture.html:
+ * fast/events/mouseenter-mouseleave-expected.txt:
+ * fast/events/mouseenter-mouseleave.html:
+
2014-02-21 Jon Honeycutt <jhoneyc...@apple.com>
Crash reloading page with position: fixed content
Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture-expected.txt (164494 => 164495)
--- trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture-expected.txt 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture-expected.txt 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,9 +1,42 @@
+mouseMoveTo(1, 1)
+mouseover on html
+mousemove on html
+
+mouseMoveTo(90,140)
+mousemove on html
+
+mouseMoveTo(110,140)
+mouseout on html
+mouseover on outer1
mouseenter on outer1
+mouseenter on body
+mousemove on outer1
+
+mouseMoveTo(130,140)
+mouseout on outer1
+mouseover on inner1
mouseenter on inner1
+mousemove on inner1
+
+mouseMoveTo(170,140)
+mouseout on inner1
mouseleave on inner1
+mouseover on inner3
mouseenter on inner3
mouseenter on inner2
+mousemove on inner3
+
+mouseMoveTo(180,140)
+mouseout on inner3
mouseleave on inner3
mouseleave on inner2
+mouseover on outer1
+mousemove on outer1
+
+mouseMoveTo(210,140)
+mouseout on outer1
mouseleave on outer1
+mouseover on console
+mouseenter on console
+mousemove on console
Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture.html (164494 => 164495)
--- trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture.html 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture.html 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html id=html>
<head>
<script>
function log(message) {
@@ -8,9 +8,8 @@
function logMouseEvent(ev) {
var target = (ev.target)? ev.target : ev.srcElement;
- if (target.id) {
- log(ev.type + " on " + target.id);
- }
+ log(ev.type + " on " + target.id);
+ event.stopPropagation();
}
function doTest() {
@@ -18,20 +17,39 @@
document.body.addEventListener('mouseenter',logMouseEvent,true);
document.body.addEventListener('mouseleave',logMouseEvent,true);
if (window.testRunner) {
- eventSender.mouseMoveTo(1, 1);
- eventSender.mouseMoveTo(90,140);
- eventSender.mouseMoveTo(110,140);
- eventSender.mouseMoveTo(130,140);
- eventSender.mouseMoveTo(170,140);
- eventSender.mouseMoveTo(180,140);
- eventSender.mouseMoveTo(210,140);
+ log("mouseMoveTo(1, 1)");
+ eventSender.mouseMoveTo(1, 1);
+ log("<br>mouseMoveTo(90,140)");
+ eventSender.mouseMoveTo(90,140);
+ log("<br>mouseMoveTo(110,140)");
+ eventSender.mouseMoveTo(110,140);
+ log("<br>mouseMoveTo(130,140)");
+ eventSender.mouseMoveTo(130,140);
+ log("<br>mouseMoveTo(170,140)");
+ eventSender.mouseMoveTo(170,140);
+ log("<br>mouseMoveTo(180,140)");
+ eventSender.mouseMoveTo(180,140);
+ log("<br>mouseMoveTo(210,140)");
+ eventSender.mouseMoveTo(210,140);
- testRunner.dumpAsText();
+ testRunner.dumpAsText();
}
}
+
+document.addEventListener("DOMContentLoaded", function(event) {
+ var mouseTargets = document.querySelectorAll('[id]');
+ for (var i = 0; i < mouseTargets.length; ++i) {
+ var target = mouseTargets[i];
+ target.addEventListener('mouseover', logMouseEvent);
+ target.addEventListener('mouseout', logMouseEvent);
+ target.addEventListener('mousemove', logMouseEvent);
+ }
+ doTest();
+});
+
</script>
</head>
-<body _onload_="doTest()">
+<body id=body>
<div id="outer1" style="width:100px; height:100px; background-color:blue; top:100px; left:100px; position:absolute">
<div id="inner1" style="width:50px; height:50px; background-color:red; top:20px; left:20px; position:absolute">
</div>
Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-expected.txt (164494 => 164495)
--- trunk/LayoutTests/fast/events/mouseenter-mouseleave-expected.txt 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/fast/events/mouseenter-mouseleave-expected.txt 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,24 +1,43 @@
+mouseMoveTo(1, 1)
+mouseover on html
+mouseenter on html
+mousemove on html
+
+mouseMoveTo(90,140)
+mousemove on html
+
+mouseMoveTo(110,140)
+mouseout on html
mouseover on outer1
+mouseenter on outer1
+mouseenter on body
+mousemove on outer1
+
+mouseMoveTo(130,140)
mouseout on outer1
mouseover on inner1
-mouseover on inner1
+mouseenter on inner1
+mousemove on inner1
+
+mouseMoveTo(170,140)
mouseout on inner1
-mouseout on inner1
+mouseleave on inner1
mouseover on inner3
-mouseover on inner3
-mouseover on inner3
-mouseout on inner3
-mouseout on inner3
-mouseout on inner3
-mouseover on outer1
-mouseout on outer1
-
-mouseenter on outer1
-mouseenter on inner1
-mouseleave on inner1
mouseenter on inner3
mouseenter on inner2
+mousemove on inner3
+
+mouseMoveTo(180,140)
+mouseout on inner3
mouseleave on inner3
mouseleave on inner2
+mouseover on outer1
+mousemove on outer1
+
+mouseMoveTo(210,140)
+mouseout on outer1
mouseleave on outer1
+mouseover on console
+mouseenter on console
+mousemove on console
Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave.html (164494 => 164495)
--- trunk/LayoutTests/fast/events/mouseenter-mouseleave.html 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/fast/events/mouseenter-mouseleave.html 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,56 +1,63 @@
<!DOCTYPE html>
-<html>
+<html id=html>
<head>
<script>
function log(message, console) {
- document.getElementById(console).innerHTML += (message + "\n");
+ document.getElementById('console').innerHTML += (message + "\n");
}
-function logMouseOverOutEvent(ev) {
+function logMouseEvent(ev) {
var target = (ev.target)? ev.target : ev.srcElement;
- log(ev.type + " on " + target.id, 'console1');
+ log(ev.type + " on " + target.id);
+ event.stopPropagation();
}
-function logMouseEnterLeaveEvent(ev) {
- var target = (ev.target)? ev.target : ev.srcElement;
- log(ev.type + " on " + target.id, 'console2');
-}
-
function doTest() {
document.body.offsetLeft;
if (window.testRunner) {
+ log("mouseMoveTo(1, 1)");
eventSender.mouseMoveTo(1, 1);
+ log("<br>mouseMoveTo(90,140)");
eventSender.mouseMoveTo(90,140);
+ log("<br>mouseMoveTo(110,140)");
eventSender.mouseMoveTo(110,140);
+ log("<br>mouseMoveTo(130,140)");
eventSender.mouseMoveTo(130,140);
+ log("<br>mouseMoveTo(170,140)");
eventSender.mouseMoveTo(170,140);
+ log("<br>mouseMoveTo(180,140)");
eventSender.mouseMoveTo(180,140);
+ log("<br>mouseMoveTo(210,140)");
eventSender.mouseMoveTo(210,140);
testRunner.dumpAsText();
}
}
+
+document.addEventListener("DOMContentLoaded", function(event) {
+ var mouseTargets = document.querySelectorAll('[id]');
+ for (var i = 0; i < mouseTargets.length; ++i) {
+ var target = mouseTargets[i];
+ target.addEventListener('mouseover', logMouseEvent);
+ target.addEventListener('mouseenter', logMouseEvent);
+ target.addEventListener('mouseout', logMouseEvent);
+ target.addEventListener('mouseleave', logMouseEvent);
+ target.addEventListener('mousemove', logMouseEvent);
+ }
+ doTest();
+});
</script>
</head>
-<body _onload_="doTest()">
-<div id="outer1" style="width:100px; height:100px; background-color:blue; top:100px; left:100px; position:absolute"
- _onMouseOver_="logMouseOverOutEvent(event)" _onMouseOut_="logMouseOverOutEvent(event)"
- _onMouseEnter_="logMouseEnterLeaveEvent(event)" _onMouseLeave_="logMouseEnterLeaveEvent(event)">
-<div id="inner1" style="width:50px; height:50px; background-color:red; top:20px; left:20px; position:absolute"
- _onMouseOver_="logMouseOverOutEvent(event)" _onMouseOut_="logMouseOverOutEvent(event)"
- _onMouseEnter_="logMouseEnterLeaveEvent(event)" _onMouseLeave_="logMouseEnterLeaveEvent(event)">
+<body id='body'>
+<div id="outer1" style="width:100px; height:100px; background-color:blue; top:100px; left:100px; position:absolute">
+ <div id="inner1" style="width:50px; height:50px; background-color:red; top:20px; left:20px; position:absolute">
+ </div>
+ <div id="inner2" style="width:20px; height:20px; background-color:yellow; top:30px; left:60px; position:absolute">
+ <div id="inner3" style="margin:5px; width:10px; height:10px; background-color:green;">
+ </div>
+ </div>
</div>
-<div id="inner2" style="width:20px; height:20px; background-color:yellow; top:30px; left:60px; position:absolute"
- _onMouseOver_="logMouseOverOutEvent(event)" _onMouseOut_="logMouseOverOutEvent(event)"
- _onMouseEnter_="logMouseEnterLeaveEvent(event)" _onMouseLeave_="logMouseEnterLeaveEvent(event)">
-<div id="inner3" style="margin:5px; width:10px; height:10px; background-color:green;"
- _onMouseOver_="logMouseOverOutEvent(event)" _onMouseOut_="logMouseOverOutEvent(event)"
- _onMouseEnter_="logMouseEnterLeaveEvent(event)" _onMouseLeave_="logMouseEnterLeaveEvent(event)">
-</div>
-</div>
-</div>
-<pre id="console1"></pre>
-<br>
-<pre id="console2"></pre>
+
+<pre id="console"></pre>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (164494 => 164495)
--- trunk/Source/WebCore/ChangeLog 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 21:29:51 UTC (rev 164495)
@@ -1,3 +1,28 @@
+2014-02-21 Benjamin Poulain <bpoul...@apple.com>
+
+ 'mouseenter' mouse compat event not fired when listeners for touch events
+ https://bugs.webkit.org/show_bug.cgi?id=128534
+
+ Reviewed by Andreas Kling.
+
+ The code dispatching mouseenter and mouseleave events was making the assumption that
+ only mouse move would cause Document::updateHoverActiveState.
+
+ This is not true in some cases. In the case of this bug, the first touch handler sets
+ the hover state. From there, the code handling enter/leave is in an inconsistent state.
+
+ This patch changes the delivery of mouse enter/leave events to be done through the regular
+ processing of mouse events. The update is done with the mouseover and mouseout events.
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareMouseEvent):
+ (WebCore::Document::updateHoverActiveState):
+ * dom/Document.h:
+ * page/EventHandler.cpp:
+ (WebCore::nearestCommonHoverAncestor):
+ (WebCore::hierarchyHasCapturingEventListeners):
+ (WebCore::EventHandler::updateMouseEventTargetNode):
+
2014-02-21 Jon Honeycutt <jhoneyc...@apple.com>
Crash reloading page with position: fixed content
Modified: trunk/Source/WebCore/dom/Document.cpp (164494 => 164495)
--- trunk/Source/WebCore/dom/Document.cpp 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-21 21:29:51 UTC (rev 164495)
@@ -2986,7 +2986,7 @@
renderView()->hitTest(request, result);
if (!request.readOnly())
- updateHoverActiveState(request, result.innerElement(), &event);
+ updateHoverActiveState(request, result.innerElement());
return MouseEventWithHitTestResults(event, result);
}
@@ -5778,13 +5778,13 @@
return nullptr;
}
-void Document::updateHoverActiveState(const HitTestRequest& request, Element* innerElement, const PlatformMouseEvent* event, StyleResolverUpdateFlag updateFlag)
+void Document::updateHoverActiveState(const HitTestRequest& request, Element* innerElement, StyleResolverUpdateFlag updateFlag)
{
ASSERT(!request.readOnly());
Element* innerElementInDocument = innerElement;
while (innerElementInDocument && &innerElementInDocument->document() != this) {
- innerElementInDocument->document().updateHoverActiveState(request, innerElementInDocument, event);
+ innerElementInDocument->document().updateHoverActiveState(request, innerElementInDocument);
innerElementInDocument = innerElementInDocument->document().ownerElement();
}
@@ -5848,26 +5848,6 @@
Vector<RefPtr<Element>, 32> elementsToRemoveFromChain;
Vector<RefPtr<Element>, 32> elementsToAddToChain;
- // mouseenter and mouseleave events are only dispatched if there is a capturing eventhandler on an ancestor
- // or a normal eventhandler on the element itself (they don't bubble).
- // This optimization is necessary since these events can cause O(n²) capturing event-handler checks.
- bool hasCapturingMouseEnterListener = false;
- bool hasCapturingMouseLeaveListener = false;
- if (event && newHoveredElement != oldHoveredElement.get()) {
- for (ContainerNode* curr = newHoveredElement; curr; curr = curr->parentOrShadowHostNode()) {
- if (curr->hasCapturingEventListeners(eventNames().mouseenterEvent)) {
- hasCapturingMouseEnterListener = true;
- break;
- }
- }
- for (ContainerNode* curr = oldHoveredElement.get(); curr; curr = curr->parentOrShadowHostNode()) {
- if (curr->hasCapturingEventListeners(eventNames().mouseleaveEvent)) {
- hasCapturingMouseLeaveListener = true;
- break;
- }
- }
- }
-
if (oldHoverObj != newHoverObj) {
// If the old hovered element is not nil but it's renderer is, it was probably detached as part of the :hover style
// (for instance by setting display:none in the :hover pseudo-class). In this case, the old hovered element (and its ancestors)
@@ -5890,7 +5870,7 @@
// Unset hovered nodes in sub frame documents if the old hovered node was a frame owner.
if (oldHoveredElement && oldHoveredElement->isFrameOwnerElement()) {
if (Document* contentDocument = toHTMLFrameOwnerElement(*oldHoveredElement).contentDocument())
- contentDocument->updateHoverActiveState(request, nullptr, event);
+ contentDocument->updateHoverActiveState(request, nullptr);
}
}
@@ -5904,11 +5884,8 @@
}
size_t removeCount = elementsToRemoveFromChain.size();
- for (size_t i = 0; i < removeCount; ++i) {
+ for (size_t i = 0; i < removeCount; ++i)
elementsToRemoveFromChain[i]->setHovered(false);
- if (event && (hasCapturingMouseLeaveListener || elementsToRemoveFromChain[i]->hasEventListeners(eventNames().mouseleaveEvent)))
- elementsToRemoveFromChain[i]->dispatchMouseEvent(*event, eventNames().mouseleaveEvent, 0, newHoveredElement);
- }
bool sawCommonAncestor = false;
for (size_t i = 0, size = elementsToAddToChain.size(); i < size; ++i) {
@@ -5919,8 +5896,6 @@
if (!sawCommonAncestor) {
// Elements after the common hover ancestor does not change hover state, but are iterated over because they may change active state.
elementsToAddToChain[i]->setHovered(true);
- if (event && (hasCapturingMouseEnterListener || elementsToAddToChain[i]->hasEventListeners(eventNames().mouseenterEvent)))
- elementsToAddToChain[i]->dispatchMouseEvent(*event, eventNames().mouseenterEvent, 0, oldHoveredElement.get());
}
}
Modified: trunk/Source/WebCore/dom/Document.h (164494 => 164495)
--- trunk/Source/WebCore/dom/Document.h 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-21 21:29:51 UTC (rev 164495)
@@ -740,7 +740,7 @@
void hoveredElementDidDetach(Element*);
void elementInActiveChainDidDetach(Element*);
- void updateHoverActiveState(const HitTestRequest&, Element*, const PlatformMouseEvent* = 0, StyleResolverUpdateFlag = RecalcStyleIfNeeded);
+ void updateHoverActiveState(const HitTestRequest&, Element*, StyleResolverUpdateFlag = RecalcStyleIfNeeded);
// Updates for :target (CSS3 selector).
void setCSSTarget(Element*);
Modified: trunk/Source/WebCore/page/EventHandler.cpp (164494 => 164495)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-02-21 21:29:51 UTC (rev 164495)
@@ -2256,6 +2256,30 @@
return toSVGUseElement(shadowTreeParentElement)->instanceForShadowTreeElement(referenceNode);
}
+static RenderElement* nearestCommonHoverAncestor(RenderElement* obj1, RenderElement* obj2)
+{
+ if (!obj1 || !obj2)
+ return nullptr;
+
+ for (RenderElement* currObj1 = obj1; currObj1; currObj1 = currObj1->hoverAncestor()) {
+ for (RenderElement* currObj2 = obj2; currObj2; currObj2 = currObj2->hoverAncestor()) {
+ if (currObj1 == currObj2)
+ return currObj1;
+ }
+ }
+
+ return nullptr;
+}
+
+static bool hierarchyHasCapturingEventListeners(Element* element, const AtomicString& eventName)
+{
+ for (ContainerNode* curr = element; curr; curr = curr->parentOrShadowHostNode()) {
+ if (curr->hasCapturingEventListeners(eventName))
+ return true;
+ }
+ return false;
+}
+
void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& mouseEvent, bool fireMouseOverOut)
{
Element* targetElement = nullptr;
@@ -2350,12 +2374,58 @@
}
if (m_lastElementUnderMouse != m_elementUnderMouse) {
- // send mouseout event to the old node
+ // mouseenter and mouseleave events are only dispatched if there is a capturing eventhandler on an ancestor
+ // or a normal eventhandler on the element itself (they don't bubble).
+ // This optimization is necessary since these events can cause O(n^2) capturing event-handler checks.
+ bool hasCapturingMouseEnterListener = hierarchyHasCapturingEventListeners(m_elementUnderMouse.get(), eventNames().mouseenterEvent);
+ bool hasCapturingMouseLeaveListener = hierarchyHasCapturingEventListeners(m_lastElementUnderMouse.get(), eventNames().mouseleaveEvent);
+
+ RenderElement* oldHoverRenderer = m_lastElementUnderMouse ? m_lastElementUnderMouse->renderer() : nullptr;
+ RenderElement* newHoverRenderer = m_elementUnderMouse ? m_elementUnderMouse->renderer() : nullptr;
+ RenderElement* ancestor = nearestCommonHoverAncestor(oldHoverRenderer, newHoverRenderer);
+
+ Vector<Ref<Element>, 32> leftElementsChain;
+ if (oldHoverRenderer) {
+ for (RenderElement* curr = oldHoverRenderer; curr && curr != ancestor; curr = curr->hoverAncestor()) {
+ if (Element* element = curr->element())
+ leftElementsChain.append(*element);
+ }
+ } else {
+ // If the old hovered element is not null but it's renderer is, it was probably detached.
+ // In this case, the old hovered element (and its ancestors) must be updated, to ensure it's normal style is re-applied.
+ for (Element* element = m_lastElementUnderMouse.get(); element; element = element->parentElement())
+ leftElementsChain.append(*element);
+ }
+
+ Vector<Ref<Element>, 32> enteredElementsChain;
+ const Element* ancestorElement = ancestor ? ancestor->element() : nullptr;
+ for (RenderElement* curr = newHoverRenderer; curr; curr = curr->hoverAncestor()) {
+ if (Element *element = curr->element()) {
+ if (element == ancestorElement)
+ break;
+ enteredElementsChain.append(*element);
+ }
+ }
+
+ // Send mouseout event to the old node.
if (m_lastElementUnderMouse)
m_lastElementUnderMouse->dispatchMouseEvent(mouseEvent, eventNames().mouseoutEvent, 0, m_elementUnderMouse.get());
- // send mouseover event to the new node
+
+ // Send mouseleave to the node hierarchy no longer under the mouse.
+ for (size_t i = 0; i < leftElementsChain.size(); ++i) {
+ if (hasCapturingMouseLeaveListener || leftElementsChain[i]->hasEventListeners(eventNames().mouseleaveEvent))
+ leftElementsChain[i]->dispatchMouseEvent(mouseEvent, eventNames().mouseleaveEvent, 0, m_elementUnderMouse.get());
+ }
+
+ // Send mouseover event to the new node.
if (m_elementUnderMouse)
m_elementUnderMouse->dispatchMouseEvent(mouseEvent, eventNames().mouseoverEvent, 0, m_lastElementUnderMouse.get());
+
+ // Send mouseleave event to the nodes hierarchy under the mouse.
+ for (size_t i = 0, size = enteredElementsChain.size(); i < size; ++i) {
+ if (hasCapturingMouseEnterListener || enteredElementsChain[i]->hasEventListeners(eventNames().mouseenterEvent))
+ enteredElementsChain[i]->dispatchMouseEvent(mouseEvent, eventNames().mouseenterEvent, 0, m_lastElementUnderMouse.get());
+ }
}
m_lastElementUnderMouse = m_elementUnderMouse;
m_lastInstanceUnderMouse = instanceAssociatedWithShadowTreeElement(m_elementUnderMouse.get());
