<!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>[202849] 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/202849">202849</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-05 23:13:08 -0700 (Tue, 05 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enhance Windows DRT implementation to support platform scroll wheel events.
https://bugs.webkit.org/show_bug.cgi?id=36002
Reviewed by Brent Fulgham.
Tools:
Implement function continuousMouseScrollBy in Windows event sender.
* DumpRenderTree/win/EventSender.cpp:
(mouseScrollBy):
(continuousMouseScrollBy):
LayoutTests:
Update test expectations.
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinEventSendercpp">trunk/Tools/DumpRenderTree/win/EventSender.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202848 => 202849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-06 05:51:20 UTC (rev 202848)
+++ trunk/LayoutTests/ChangeLog 2016-07-06 06:13:08 UTC (rev 202849)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-07-05 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><ins>+ Enhance Windows DRT implementation to support platform scroll wheel events.
+ https://bugs.webkit.org/show_bug.cgi?id=36002
+
+ Reviewed by Brent Fulgham.
+
+ Update test expectations.
+
+ * platform/win/TestExpectations:
+
+2016-07-05 Per Arne Vollan <pvollan@apple.com>
+
</ins><span class="cx"> [Win] Layout Test http/tests/security/contentSecurityPolicy/source-list-parsing-10.html is failing
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147646
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (202848 => 202849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2016-07-06 05:51:20 UTC (rev 202848)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-07-06 06:13:08 UTC (rev 202849)
</span><span class="lines">@@ -224,23 +224,13 @@
</span><span class="cx"> # TODO Need to add functionality to DumpRenderTree to handle enable/disable Spatial Navigation
</span><span class="cx"> fast/spatial-navigation/ [ Skip ]
</span><span class="cx">
</span><del>-# TODO mouseScrollBy() and continuousMouseScrollBy() are not yet implemented in the Windows EventSender API.
-webkit.org/b/36002 fast/events/remove-child-onscroll.html [ Skip ]
-webkit.org/b/36002 fast/events/platform-wheelevent-in-scrolling-div.html [ Skip ]
-webkit.org/b/36002 fast/events/platform-wheelevent-with-delta-zero-crash.html [ Skip ]
-webkit.org/b/36002 fast/events/continuous-platform-wheelevent-in-scrolling-div.html [ Skip ]
-webkit.org/b/36002 fast/events/scroll-in-scaled-page-with-overflow-hidden.html [ Skip ]
-webkit.org/b/36002 fast/events/wheelevent-direction-inverted-from-device.html [ Skip ]
-webkit.org/b/36002 fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html [ Skip ]
-webkit.org/b/36002 fast/events/wheelevent-in-text-node.html [ Skip ]
-webkit.org/b/36002 fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html [ Skip ]
-webkit.org/b/36002 fast/forms/search/search-scroll-hidden-decoration-container-crash.html [ Skip ]
-webkit.org/b/36002 fast/repaint/overflow-auto-in-overflow-auto-scrolled.html [ Skip ]
-webkit.org/b/36002 fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html [ Skip ]
-webkit.org/b/36002 fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html [ Skip ]
-webkit.org/b/36002 fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html [ Skip ]
-webkit.org/b/36002 scrollbars/scrollevent-iframe-no-scrolling-wheel.html [ Skip ]
-webkit.org/b/36002 scrollbars/scroll-rtl-or-bt-layer.html [ Skip ]
</del><ins>+# TODO Investigate why these mouse scroll tests are failing.
+fast/events/platform-wheelevent-in-scrolling-div.html [ Failure ]
+fast/events/continuous-platform-wheelevent-in-scrolling-div.html [ Failure ]
+fast/events/scroll-in-scaled-page-with-overflow-hidden.html [ Failure ]
+fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html [ Failure ]
+fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html [ Failure ]
+scrollbars/scroll-rtl-or-bt-layer.html [ Timeout ]
</ins><span class="cx">
</span><span class="cx"> # TODO Needs testRunner.enableAutoResizeMode()
</span><span class="cx"> fast/autoresize/ [ Skip ]
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202848 => 202849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-06 05:51:20 UTC (rev 202848)
+++ trunk/Tools/ChangeLog 2016-07-06 06:13:08 UTC (rev 202849)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-05 Per Arne Vollan <pvollan@apple.com>
+
+ Enhance Windows DRT implementation to support platform scroll wheel events.
+ https://bugs.webkit.org/show_bug.cgi?id=36002
+
+ Reviewed by Brent Fulgham.
+
+ Implement function continuousMouseScrollBy in Windows event sender.
+
+ * DumpRenderTree/win/EventSender.cpp:
+ (mouseScrollBy):
+ (continuousMouseScrollBy):
+
</ins><span class="cx"> 2016-07-05 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Sierra] Rebaseline tests to use un-mocked system font metrics
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinEventSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/EventSender.cpp (202848 => 202849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/EventSender.cpp 2016-07-06 05:51:20 UTC (rev 202848)
+++ trunk/Tools/DumpRenderTree/win/EventSender.cpp 2016-07-06 06:13:08 UTC (rev 202849)
</span><span class="lines">@@ -781,19 +781,49 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void mouseScrollBy(double x, double y, bool continuous)
+{
+ RECT rect;
+ ::GetWindowRect(webViewWindow, &rect);
+
+ // This value is taken from Source/WebCore/platform/win/WheelEventWin.cpp
+ const float cScrollbarPixelsPerLine = 100.0f / 3.0f;
+
+ if (x) {
+ UINT scrollChars = 1;
+ ::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0, &scrollChars, 0);
+ x *= WHEEL_DELTA / scrollChars;
+ if (continuous)
+ x /= cScrollbarPixelsPerLine;
+ MSG msg = makeMsg(webViewWindow, WM_MOUSEHWHEEL, MAKEWPARAM(0, x), MAKELPARAM(rect.left + lastMousePosition.x, rect.top + lastMousePosition.y));
+ dispatchMessage(&msg);
+ }
+
+ if (y) {
+ UINT scrollLines = 3;
+ ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &scrollLines, 0);
+ y *= WHEEL_DELTA / scrollLines;
+ if (continuous)
+ y /= cScrollbarPixelsPerLine;
+ MSG msg = makeMsg(webViewWindow, WM_MOUSEWHEEL, MAKEWPARAM(0, y), MAKELPARAM(rect.left + lastMousePosition.x, rect.top + lastMousePosition.y));
+ dispatchMessage(&msg);
+ }
+}
+
</ins><span class="cx"> static JSValueRef mouseScrollBy(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> if (argumentCount < 1)
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx">
</span><del>- double delta = JSValueToNumber(context, arguments[1], exception);
</del><ins>+ double deltaX = JSValueToNumber(context, arguments[0], exception);
</ins><span class="cx">
</span><del>- RECT rect;
- ::GetWindowRect(webViewWindow, &rect);
</del><ins>+ double deltaY = 0;
</ins><span class="cx">
</span><del>- MSG msg = makeMsg(webViewWindow, WM_MOUSEWHEEL, MAKEWPARAM(0, delta), MAKELPARAM(rect.left + lastMousePosition.x, rect.top + lastMousePosition.y));
- dispatchMessage(&msg);
</del><ins>+ if (argumentCount >= 2)
+ deltaY = JSValueToNumber(context, arguments[1], exception);
</ins><span class="cx">
</span><ins>+ mouseScrollBy(deltaX, deltaY, false);
+
</ins><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -802,6 +832,23 @@
</span><span class="cx"> return mouseScrollBy(context, function, thisObject, argumentCount, arguments, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef continuousMouseScrollBy(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ double deltaX = JSValueToNumber(context, arguments[0], exception);
+
+ double deltaY = 0;
+
+ if (argumentCount >= 2)
+ deltaY = JSValueToNumber(context, arguments[1], exception);
+
+ mouseScrollBy(deltaX, deltaY, true);
+
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static JSStaticFunction staticFunctions[] = {
</span><span class="cx"> { "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="lines">@@ -818,6 +865,7 @@
</span><span class="cx"> { "scalePageBy", scalePageByCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseScrollBy", mouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseScrollByWithWheelAndMomentumPhases", mouseScrollByWithWheelAndMomentumPhasesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "continuousMouseScrollBy", continuousMouseScrollBy, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>