<!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>[180018] 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/180018">180018</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 15:09:05 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Should not send wheel events with a delta of 0
https://bugs.webkit.org/show_bug.cgi?id=141537
-and corresponding-
rdar://problem/18903118
Reviewed by Simon Fraser.
Source/WebCore:
This code should not have been removed entirely to accommodate rubber-banding, it
just needs to return false instead of true in order to allow the MayBegin and
Ended phases to be handled by the ElasticityController.
* dom/Element.cpp:
(WebCore::Element::dispatchWheelEvent):
LayoutTests:
* platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingwheeleventswithnodeltaexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingwheeleventswithnodeltahtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180017 => 180018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-12 23:08:39 UTC (rev 180017)
+++ trunk/LayoutTests/ChangeLog 2015-02-12 23:09:05 UTC (rev 180018)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-12 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Should not send wheel events with a delta of 0
+ https://bugs.webkit.org/show_bug.cgi?id=141537
+ -and corresponding-
+ rdar://problem/18903118
+
+ Reviewed by Simon Fraser.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html: Added.
+
</ins><span class="cx"> 2015-02-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Crash inspecting styles of element with mutated stylesheet
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingwheeleventswithnodeltaexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt (0 => 180018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta-expected.txt 2015-02-12 23:09:05 UTC (rev 180018)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Success! We didn't get a wheel event with a delta of 0.
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingwheeleventswithnodeltahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html (0 => 180018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/wheel-events-with-no-delta.html 2015-02-12 23:09:05 UTC (rev 180018)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<html>
+<head>
+<style>
+body {
+ height: 2000px;
+}
+</style>
+
+<script>
+
+function mouseWheelFired(e) {
+ if (e.wheelDelta == 0)
+ document.getElementById('log').textContent = "FAIL. We got a wheel event with a delta of 0.";
+
+ if (window.eventSender)
+ testRunner.notifyDone();
+}
+
+function scrollTest()
+{
+ eventSender.mouseMoveTo(20, 20);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'begin');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
+}
+
+function loaded()
+{
+ document.body.addEventListener('mousewheel', mouseWheelFired, false);
+
+ if (window.eventSender) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(scrollTest, 0);
+ }
+}
+
+window.addEventListener('load', loaded, false);
+</script>
+</head>
+
+<body>
+
+<!--To run this test outside of the test harness, just manually scroll and ensure that the success message
+does not change to a failure message.-->
+<pre id="log">Success! We didn't get a wheel event with a delta of 0.</pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180017 => 180018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-12 23:08:39 UTC (rev 180017)
+++ trunk/Source/WebCore/ChangeLog 2015-02-12 23:09:05 UTC (rev 180018)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-12 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Should not send wheel events with a delta of 0
+ https://bugs.webkit.org/show_bug.cgi?id=141537
+ -and corresponding-
+ rdar://problem/18903118
+
+ Reviewed by Simon Fraser.
+
+ This code should not have been removed entirely to accommodate rubber-banding, it
+ just needs to return false instead of true in order to allow the MayBegin and
+ Ended phases to be handled by the ElasticityController.
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchWheelEvent):
+
</ins><span class="cx"> 2015-02-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Media] Implement 3-style media timeline (buffered, played, unavailable)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (180017 => 180018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-02-12 23:08:39 UTC (rev 180017)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-02-12 23:09:05 UTC (rev 180018)
</span><span class="lines">@@ -279,6 +279,9 @@
</span><span class="cx">
</span><span class="cx"> bool Element::dispatchWheelEvent(const PlatformWheelEvent& event)
</span><span class="cx"> {
</span><ins>+ if (!event.deltaX() && !event.deltaY())
+ return false;
+
</ins><span class="cx"> RefPtr<WheelEvent> wheelEvent = WheelEvent::create(event, document().defaultView());
</span><span class="cx"> return EventDispatcher::dispatchEvent(this, wheelEvent) && !wheelEvent->defaultHandled();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>