<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20743] trunk</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20743">20743</a></dd>
<dt>Author</dt> <dd>adele</dd>
<dt>Date</dt> <dd>2007-04-05 22:25:10 -0700 (Thu, 05 Apr 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutTests:

        Reviewed by Oliver.

        Test for &lt;rdar://problem/4965597&gt; REGRESSION: mouseup doesn't fire for slider (causes it to always default to max)

        * fast/forms/slider-mouse-events-expected.txt: Added.
        * fast/forms/slider-mouse-events.html: Added.

WebCore:

        Reviewed by Oliver.

        Fix for &lt;rdar://problem/4965597&gt; REGRESSION: mouseup doesn't fire for slider (causes it to always default to max)

        Test: fast/forms/slider-mouse-events.html

        * page/EventHandler.cpp: (WebCore::EventHandler::dispatchMouseEvent):
        Since the actual target node of the event can't be a shadow node, set the target node to the capturing node before adjusting it.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsslidermouseeventsexpectedtxt">trunk/LayoutTests/fast/forms/slider-mouse-events-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsslidermouseeventshtml">trunk/LayoutTests/fast/forms/slider-mouse-events.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (20742 => 20743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2007-04-06 03:05:48 UTC (rev 20742)
+++ trunk/LayoutTests/ChangeLog        2007-04-06 05:25:10 UTC (rev 20743)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-04-05  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Oliver.
+
+        Test for &lt;rdar://problem/4965597&gt; REGRESSION: mouseup doesn't fire for slider (causes it to always default to max)
+
+        * fast/forms/slider-mouse-events-expected.txt: Added.
+        * fast/forms/slider-mouse-events.html: Added.
+
</ins><span class="cx"> 2007-04-05  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Adam.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsslidermouseeventsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/slider-mouse-events-expected.txt (0 => 20743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/slider-mouse-events-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/forms/slider-mouse-events-expected.txt        2007-04-06 05:25:10 UTC (rev 20743)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+This tests that slider controls get mouse down, input, and mouseup events.
+
+mousedown
+input
+mouseup
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsslidermouseeventshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/slider-mouse-events.html (0 => 20743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/slider-mouse-events.html                                (rev 0)
+++ trunk/LayoutTests/fast/forms/slider-mouse-events.html        2007-04-06 05:25:10 UTC (rev 20743)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script&gt;
+            function log(msg)
+            {
+                var res = document.getElementById('res');
+                res.innerHTML = res.innerHTML + msg + &quot;&lt;br&gt;&quot;;
+            }
+            function test()
+            {
+                var slider = document.getElementById('slider');
+                if (window.layoutTestController) {
+                    layoutTestController.dumpAsText();
+                    eventSender.mouseMoveTo(slider.offsetLeft + 7, slider.offsetTop + 7);
+                    eventSender.mouseDown();
+                    eventSender.mouseMoveTo(slider.offsetLeft + 50, slider.offsetTop + 50);
+                    eventSender.mouseUp();
+                }
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;test()&quot;&gt;
+        This tests that slider controls get mouse down, input, and mouseup events.&lt;br&gt;
+        &lt;input type=&quot;range&quot; id=&quot;slider&quot; onmousedown=&quot;log('mousedown')&quot; onmouseup=&quot;log('mouseup')&quot; oninput=&quot;log('input')&quot; value=0&gt;
+        &lt;div id=&quot;res&quot;&gt;&lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20742 => 20743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-04-06 03:05:48 UTC (rev 20742)
+++ trunk/WebCore/ChangeLog        2007-04-06 05:25:10 UTC (rev 20743)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-04-05  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Oliver.
+
+        Fix for &lt;rdar://problem/4965597&gt; REGRESSION: mouseup doesn't fire for slider (causes it to always default to max)
+
+        Test: fast/forms/slider-mouse-events.html
+
+        * page/EventHandler.cpp: (WebCore::EventHandler::dispatchMouseEvent):
+        Since the actual target node of the event can't be a shadow node, set the target node to the capturing node before adjusting it.
+
</ins><span class="cx"> 2007-04-05  Kevin McCullough  &lt;kmccullough@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (20742 => 20743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp        2007-04-06 03:05:48 UTC (rev 20742)
+++ trunk/WebCore/page/EventHandler.cpp        2007-04-06 05:25:10 UTC (rev 20743)
</span><span class="lines">@@ -1084,14 +1084,14 @@
</span><span class="cx"> bool EventHandler::dispatchMouseEvent(const AtomicString&amp; eventType, Node* targetNode, bool cancelable,
</span><span class="cx">     int clickCount, const PlatformMouseEvent&amp; mouseEvent, bool setUnder)
</span><span class="cx"> {
</span><ins>+    if (m_capturingMouseEventsNode)
+        targetNode = m_capturingMouseEventsNode.get();
+    
</ins><span class="cx">     // if the target node is a text node, dispatch on the parent node - rdar://4196646
</span><span class="cx">     if (targetNode &amp;&amp; targetNode-&gt;isTextNode())
</span><span class="cx">         targetNode = targetNode-&gt;parentNode();
</span><span class="cx">     if (targetNode)
</span><span class="cx">         targetNode = targetNode-&gt;shadowAncestorNode();
</span><del>-
-    if (m_capturingMouseEventsNode)
-        targetNode = m_capturingMouseEventsNode.get();
</del><span class="cx">         
</span><span class="cx">     m_nodeUnderMouse = targetNode;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>