<!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>[195659] trunk/Source/WebCore</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/195659">195659</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-27 02:24:57 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ScrollAnimator is not notified when mouse entered, moved or exited a RenderListBox
https://bugs.webkit.org/show_bug.cgi?id=153398
Reviewed by Michael Catanzaro.
EvenHandler is checking whether the enclosing layer of a node is
registered as scrollable area of its frame view. That doesn't work
for list boxes, because they are the scrollable area
themselves. Also when entering a list box the node under mouse is
not usually the list box itself, but any of its children, a
HTMLOptionElement or a HTMLOptGroupElement. Instead of comparing
layers, we should find the enclosing scrollable area of the target
elements and compare them to decide whether the mouse has entered,
left or moved a scrollable area.
* page/EventHandler.cpp:
(WebCore::enclosingScrollableArea): Return the enclosing
scrollable area of the given node. If the node doesn't have a
renderer, it traverses its parents. If the renderer is a
RenderListBox it is returned, otherwhise the enclosing layer is
returned.
(WebCore::EventHandler::mouseMoved): Use enclosingScrollableArea.
(WebCore::EventHandler::updateMouseEventTargetNode): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195658 => 195659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-27 07:43:50 UTC (rev 195658)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 10:24:57 UTC (rev 195659)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ ScrollAnimator is not notified when mouse entered, moved or exited a RenderListBox
+ https://bugs.webkit.org/show_bug.cgi?id=153398
+
+ Reviewed by Michael Catanzaro.
+
+ EvenHandler is checking whether the enclosing layer of a node is
+ registered as scrollable area of its frame view. That doesn't work
+ for list boxes, because they are the scrollable area
+ themselves. Also when entering a list box the node under mouse is
+ not usually the list box itself, but any of its children, a
+ HTMLOptionElement or a HTMLOptGroupElement. Instead of comparing
+ layers, we should find the enclosing scrollable area of the target
+ elements and compare them to decide whether the mouse has entered,
+ left or moved a scrollable area.
+
+ * page/EventHandler.cpp:
+ (WebCore::enclosingScrollableArea): Return the enclosing
+ scrollable area of the given node. If the node doesn't have a
+ renderer, it traverses its parents. If the renderer is a
+ RenderListBox it is returned, otherwhise the enclosing layer is
+ returned.
+ (WebCore::EventHandler::mouseMoved): Use enclosingScrollableArea.
+ (WebCore::EventHandler::updateMouseEventTargetNode): Ditto.
+
</ins><span class="cx"> 2016-01-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Try touching DerivedSources.make to force rebuilding.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (195658 => 195659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-01-27 07:43:50 UTC (rev 195658)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-01-27 10:24:57 UTC (rev 195659)
</span><span class="lines">@@ -1753,20 +1753,26 @@
</span><span class="cx"> return swallowMouseUpEvent || swallowClickEvent || swallowMouseReleaseEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderLayer* layerForNode(Node* node)
</del><ins>+static ScrollableArea* enclosingScrollableArea(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- auto renderer = node->renderer();
- if (!renderer)
- return 0;
</del><ins>+ for (auto element = node; element; element = element->parentOrShadowHostNode()) {
+ if (is<HTMLIFrameElement>(*element) || is<HTMLHtmlElement>(*element) || is<HTMLDocument>(*element))
+ return nullptr;
</ins><span class="cx">
</span><del>- RenderLayer* layer = renderer->enclosingLayer();
- if (!layer)
- return 0;
</del><ins>+ auto renderer = element->renderer();
+ if (!renderer)
+ continue;
</ins><span class="cx">
</span><del>- return layer;
</del><ins>+ if (is<RenderListBox>(*renderer))
+ return downcast<RenderListBox>(renderer);
+
+ return renderer->enclosingLayer();
+ }
+
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool EventHandler::mouseMoved(const PlatformMouseEvent& event)
</span><span class="lines">@@ -1784,10 +1790,10 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (RenderLayer* layer = layerForNode(hoveredNode.innerNode())) {
</del><ins>+ if (auto scrolledArea = enclosingScrollableArea(hoveredNode.innerNode())) {
</ins><span class="cx"> if (FrameView* frameView = m_frame.view()) {
</span><del>- if (frameView->containsScrollableArea(layer))
- layer->mouseMovedInContentArea();
</del><ins>+ if (frameView->containsScrollableArea(scrolledArea))
+ scrolledArea->mouseMovedInContentArea();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2360,8 +2366,8 @@
</span><span class="cx">
</span><span class="cx"> // Fire mouseout/mouseover if the mouse has shifted to a different node.
</span><span class="cx"> if (fireMouseOverOut) {
</span><del>- RenderLayer* layerForLastNode = layerForNode(m_lastElementUnderMouse.get());
- RenderLayer* layerForNodeUnderMouse = layerForNode(m_elementUnderMouse.get());
</del><ins>+ auto scrollableAreaForLastNode = enclosingScrollableArea(m_lastElementUnderMouse.get());
+ auto scrollableAreaForNodeUnderMouse = enclosingScrollableArea(m_elementUnderMouse.get());
</ins><span class="cx"> Page* page = m_frame.page();
</span><span class="cx">
</span><span class="cx"> if (m_lastElementUnderMouse && (!m_elementUnderMouse || &m_elementUnderMouse->document() != m_frame.document())) {
</span><span class="lines">@@ -2370,12 +2376,12 @@
</span><span class="cx"> if (FrameView* frameView = frame->view())
</span><span class="cx"> frameView->mouseExitedContentArea();
</span><span class="cx"> }
</span><del>- } else if (page && (layerForLastNode && (!layerForNodeUnderMouse || layerForNodeUnderMouse != layerForLastNode))) {
</del><ins>+ } else if (page && (scrollableAreaForLastNode && (!scrollableAreaForNodeUnderMouse || scrollableAreaForNodeUnderMouse != scrollableAreaForLastNode))) {
</ins><span class="cx"> // The mouse has moved between layers.
</span><span class="cx"> if (Frame* frame = m_lastElementUnderMouse->document().frame()) {
</span><span class="cx"> if (FrameView* frameView = frame->view()) {
</span><del>- if (frameView->containsScrollableArea(layerForLastNode))
- layerForLastNode->mouseExitedContentArea();
</del><ins>+ if (frameView->containsScrollableArea(scrollableAreaForLastNode))
+ scrollableAreaForLastNode->mouseExitedContentArea();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2386,12 +2392,12 @@
</span><span class="cx"> if (FrameView* frameView = frame->view())
</span><span class="cx"> frameView->mouseEnteredContentArea();
</span><span class="cx"> }
</span><del>- } else if (page && (layerForNodeUnderMouse && (!layerForLastNode || layerForNodeUnderMouse != layerForLastNode))) {
</del><ins>+ } else if (page && (scrollableAreaForNodeUnderMouse && (!scrollableAreaForLastNode || scrollableAreaForNodeUnderMouse != scrollableAreaForLastNode))) {
</ins><span class="cx"> // The mouse has moved between layers.
</span><span class="cx"> if (Frame* frame = m_elementUnderMouse->document().frame()) {
</span><span class="cx"> if (FrameView* frameView = frame->view()) {
</span><del>- if (frameView->containsScrollableArea(layerForNodeUnderMouse))
- layerForNodeUnderMouse->mouseEnteredContentArea();
</del><ins>+ if (frameView->containsScrollableArea(scrollableAreaForNodeUnderMouse))
+ scrollableAreaForNodeUnderMouse->mouseEnteredContentArea();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>