<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164495] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164495">164495</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-21 13:29:51 -0800 (Fri, 21 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>'mouseenter' mouse compat event not fired when listeners for touch events
https://bugs.webkit.org/show_bug.cgi?id=128534
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-21
Reviewed by Andreas Kling.
Source/WebCore:
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):
LayoutTests:
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsmouseentermouseleavecaptureexpectedtxt">trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsmouseentermouseleavecapturehtml">trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsmouseentermouseleaveexpectedtxt">trunk/LayoutTests/fast/events/mouseenter-mouseleave-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsmouseentermouseleavehtml">trunk/LayoutTests/fast/events/mouseenter-mouseleave.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-21 21:26:53 UTC (rev 164494)
+++ trunk/LayoutTests/ChangeLog 2014-02-21 21:29:51 UTC (rev 164495)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-21 Benjamin Poulain <bpoulain@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:
+
</ins><span class="cx"> 2014-02-21 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash reloading page with position: fixed content
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmouseentermouseleavecaptureexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture-expected.txt (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,9 +1,42 @@
</span><ins>+mouseMoveTo(1, 1)
+mouseover on html
+mousemove on html
+
+mouseMoveTo(90,140)
+mousemove on html
+
+mouseMoveTo(110,140)
+mouseout on html
+mouseover on outer1
</ins><span class="cx"> mouseenter on outer1
</span><ins>+mouseenter on body
+mousemove on outer1
+
+mouseMoveTo(130,140)
+mouseout on outer1
+mouseover on inner1
</ins><span class="cx"> mouseenter on inner1
</span><ins>+mousemove on inner1
+
+mouseMoveTo(170,140)
+mouseout on inner1
</ins><span class="cx"> mouseleave on inner1
</span><ins>+mouseover on inner3
</ins><span class="cx"> mouseenter on inner3
</span><span class="cx"> mouseenter on inner2
</span><ins>+mousemove on inner3
+
+mouseMoveTo(180,140)
+mouseout on inner3
</ins><span class="cx"> mouseleave on inner3
</span><span class="cx"> mouseleave on inner2
</span><ins>+mouseover on outer1
+mousemove on outer1
+
+mouseMoveTo(210,140)
+mouseout on outer1
</ins><span class="cx"> mouseleave on outer1
</span><ins>+mouseover on console
+mouseenter on console
+mousemove on console
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmouseentermouseleavecapturehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-capture.html (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<html>
</del><ins>+<html id=html>
</ins><span class="cx"> <head>
</span><span class="cx"> <script>
</span><span class="cx"> function log(message) {
</span><span class="lines">@@ -8,9 +8,8 @@
</span><span class="cx">
</span><span class="cx"> function logMouseEvent(ev) {
</span><span class="cx"> var target = (ev.target)? ev.target : ev.srcElement;
</span><del>- if (target.id) {
- log(ev.type + " on " + target.id);
- }
</del><ins>+ log(ev.type + " on " + target.id);
+ event.stopPropagation();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function doTest() {
</span><span class="lines">@@ -18,20 +17,39 @@
</span><span class="cx"> document.body.addEventListener('mouseenter',logMouseEvent,true);
</span><span class="cx"> document.body.addEventListener('mouseleave',logMouseEvent,true);
</span><span class="cx"> if (window.testRunner) {
</span><del>- 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);
</del><ins>+ 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);
</ins><span class="cx">
</span><del>- testRunner.dumpAsText();
</del><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+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();
+});
+
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body onload="doTest()">
</del><ins>+<body id=body>
</ins><span class="cx"> <div id="outer1" style="width:100px; height:100px; background-color:blue; top:100px; left:100px; position:absolute">
</span><span class="cx"> <div id="inner1" style="width:50px; height:50px; background-color:red; top:20px; left:20px; position:absolute">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmouseentermouseleaveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave-expected.txt (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,24 +1,43 @@
</span><ins>+mouseMoveTo(1, 1)
+mouseover on html
+mouseenter on html
+mousemove on html
+
+mouseMoveTo(90,140)
+mousemove on html
+
+mouseMoveTo(110,140)
+mouseout on html
</ins><span class="cx"> mouseover on outer1
</span><ins>+mouseenter on outer1
+mouseenter on body
+mousemove on outer1
+
+mouseMoveTo(130,140)
</ins><span class="cx"> mouseout on outer1
</span><span class="cx"> mouseover on inner1
</span><del>-mouseover on inner1
</del><ins>+mouseenter on inner1
+mousemove on inner1
+
+mouseMoveTo(170,140)
</ins><span class="cx"> mouseout on inner1
</span><del>-mouseout on inner1
</del><ins>+mouseleave on inner1
</ins><span class="cx"> mouseover on inner3
</span><del>-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
</del><span class="cx"> mouseenter on inner3
</span><span class="cx"> mouseenter on inner2
</span><ins>+mousemove on inner3
+
+mouseMoveTo(180,140)
+mouseout on inner3
</ins><span class="cx"> mouseleave on inner3
</span><span class="cx"> mouseleave on inner2
</span><ins>+mouseover on outer1
+mousemove on outer1
+
+mouseMoveTo(210,140)
+mouseout on outer1
</ins><span class="cx"> mouseleave on outer1
</span><ins>+mouseover on console
+mouseenter on console
+mousemove on console
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmouseentermouseleavehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/mouseenter-mouseleave.html (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,56 +1,63 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<html>
</del><ins>+<html id=html>
</ins><span class="cx"> <head>
</span><span class="cx"> <script>
</span><span class="cx"> function log(message, console) {
</span><del>- document.getElementById(console).innerHTML += (message + "\n");
</del><ins>+ document.getElementById('console').innerHTML += (message + "\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function logMouseOverOutEvent(ev) {
</del><ins>+function logMouseEvent(ev) {
</ins><span class="cx"> var target = (ev.target)? ev.target : ev.srcElement;
</span><del>- log(ev.type + " on " + target.id, 'console1');
</del><ins>+ log(ev.type + " on " + target.id);
+ event.stopPropagation();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function logMouseEnterLeaveEvent(ev) {
- var target = (ev.target)? ev.target : ev.srcElement;
- log(ev.type + " on " + target.id, 'console2');
-}
-
</del><span class="cx"> function doTest() {
</span><span class="cx"> document.body.offsetLeft;
</span><span class="cx"> if (window.testRunner) {
</span><ins>+ log("mouseMoveTo(1, 1)");
</ins><span class="cx"> eventSender.mouseMoveTo(1, 1);
</span><ins>+ log("<br>mouseMoveTo(90,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(90,140);
</span><ins>+ log("<br>mouseMoveTo(110,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(110,140);
</span><ins>+ log("<br>mouseMoveTo(130,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(130,140);
</span><ins>+ log("<br>mouseMoveTo(170,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(170,140);
</span><ins>+ log("<br>mouseMoveTo(180,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(180,140);
</span><ins>+ log("<br>mouseMoveTo(210,140)");
</ins><span class="cx"> eventSender.mouseMoveTo(210,140);
</span><span class="cx">
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+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();
+});
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<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)">
</del><ins>+<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>
</ins><span class="cx"> </div>
</span><del>-<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>
</del><ins>+
+<pre id="console"></pre>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-21 Benjamin Poulain <bpoulain@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):
+
</ins><span class="cx"> 2014-02-21 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash reloading page with position: fixed content
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2986,7 +2986,7 @@
</span><span class="cx"> renderView()->hitTest(request, result);
</span><span class="cx">
</span><span class="cx"> if (!request.readOnly())
</span><del>- updateHoverActiveState(request, result.innerElement(), &event);
</del><ins>+ updateHoverActiveState(request, result.innerElement());
</ins><span class="cx">
</span><span class="cx"> return MouseEventWithHitTestResults(event, result);
</span><span class="cx"> }
</span><span class="lines">@@ -5778,13 +5778,13 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::updateHoverActiveState(const HitTestRequest& request, Element* innerElement, const PlatformMouseEvent* event, StyleResolverUpdateFlag updateFlag)
</del><ins>+void Document::updateHoverActiveState(const HitTestRequest& request, Element* innerElement, StyleResolverUpdateFlag updateFlag)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!request.readOnly());
</span><span class="cx">
</span><span class="cx"> Element* innerElementInDocument = innerElement;
</span><span class="cx"> while (innerElementInDocument && &innerElementInDocument->document() != this) {
</span><del>- innerElementInDocument->document().updateHoverActiveState(request, innerElementInDocument, event);
</del><ins>+ innerElementInDocument->document().updateHoverActiveState(request, innerElementInDocument);
</ins><span class="cx"> innerElementInDocument = innerElementInDocument->document().ownerElement();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5848,26 +5848,6 @@
</span><span class="cx"> Vector<RefPtr<Element>, 32> elementsToRemoveFromChain;
</span><span class="cx"> Vector<RefPtr<Element>, 32> elementsToAddToChain;
</span><span class="cx">
</span><del>- // 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;
- }
- }
- }
-
</del><span class="cx"> if (oldHoverObj != newHoverObj) {
</span><span class="cx"> // If the old hovered element is not nil but it's renderer is, it was probably detached as part of the :hover style
</span><span class="cx"> // (for instance by setting display:none in the :hover pseudo-class). In this case, the old hovered element (and its ancestors)
</span><span class="lines">@@ -5890,7 +5870,7 @@
</span><span class="cx"> // Unset hovered nodes in sub frame documents if the old hovered node was a frame owner.
</span><span class="cx"> if (oldHoveredElement && oldHoveredElement->isFrameOwnerElement()) {
</span><span class="cx"> if (Document* contentDocument = toHTMLFrameOwnerElement(*oldHoveredElement).contentDocument())
</span><del>- contentDocument->updateHoverActiveState(request, nullptr, event);
</del><ins>+ contentDocument->updateHoverActiveState(request, nullptr);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5904,11 +5884,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t removeCount = elementsToRemoveFromChain.size();
</span><del>- for (size_t i = 0; i < removeCount; ++i) {
</del><ins>+ for (size_t i = 0; i < removeCount; ++i)
</ins><span class="cx"> elementsToRemoveFromChain[i]->setHovered(false);
</span><del>- if (event && (hasCapturingMouseLeaveListener || elementsToRemoveFromChain[i]->hasEventListeners(eventNames().mouseleaveEvent)))
- elementsToRemoveFromChain[i]->dispatchMouseEvent(*event, eventNames().mouseleaveEvent, 0, newHoveredElement);
- }
</del><span class="cx">
</span><span class="cx"> bool sawCommonAncestor = false;
</span><span class="cx"> for (size_t i = 0, size = elementsToAddToChain.size(); i < size; ++i) {
</span><span class="lines">@@ -5919,8 +5896,6 @@
</span><span class="cx"> if (!sawCommonAncestor) {
</span><span class="cx"> // Elements after the common hover ancestor does not change hover state, but are iterated over because they may change active state.
</span><span class="cx"> elementsToAddToChain[i]->setHovered(true);
</span><del>- if (event && (hasCapturingMouseEnterListener || elementsToAddToChain[i]->hasEventListeners(eventNames().mouseenterEvent)))
- elementsToAddToChain[i]->dispatchMouseEvent(*event, eventNames().mouseenterEvent, 0, oldHoveredElement.get());
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> void hoveredElementDidDetach(Element*);
</span><span class="cx"> void elementInActiveChainDidDetach(Element*);
</span><span class="cx">
</span><del>- void updateHoverActiveState(const HitTestRequest&, Element*, const PlatformMouseEvent* = 0, StyleResolverUpdateFlag = RecalcStyleIfNeeded);
</del><ins>+ void updateHoverActiveState(const HitTestRequest&, Element*, StyleResolverUpdateFlag = RecalcStyleIfNeeded);
</ins><span class="cx">
</span><span class="cx"> // Updates for :target (CSS3 selector).
</span><span class="cx"> void setCSSTarget(Element*);
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (164494 => 164495)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2256,6 +2256,30 @@
</span><span class="cx"> return toSVGUseElement(shadowTreeParentElement)->instanceForShadowTreeElement(referenceNode);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& mouseEvent, bool fireMouseOverOut)
</span><span class="cx"> {
</span><span class="cx"> Element* targetElement = nullptr;
</span><span class="lines">@@ -2350,12 +2374,58 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_lastElementUnderMouse != m_elementUnderMouse) {
</span><del>- // send mouseout event to the old node
</del><ins>+ // 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.
</ins><span class="cx"> if (m_lastElementUnderMouse)
</span><span class="cx"> m_lastElementUnderMouse->dispatchMouseEvent(mouseEvent, eventNames().mouseoutEvent, 0, m_elementUnderMouse.get());
</span><del>- // send mouseover event to the new node
</del><ins>+
+ // 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.
</ins><span class="cx"> if (m_elementUnderMouse)
</span><span class="cx"> m_elementUnderMouse->dispatchMouseEvent(mouseEvent, eventNames().mouseoverEvent, 0, m_lastElementUnderMouse.get());
</span><ins>+
+ // 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());
+ }
</ins><span class="cx"> }
</span><span class="cx"> m_lastElementUnderMouse = m_elementUnderMouse;
</span><span class="cx"> m_lastInstanceUnderMouse = instanceAssociatedWithShadowTreeElement(m_elementUnderMouse.get());
</span></span></pre>
</div>
</div>
</body>
</html>