<!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>[212053] branches/safari-603-branch</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/212053">212053</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 22:36:19 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211663">r211663</a>. rdar://problem/30343810</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestspointerlockmouseeventdeliveryexpectedtxt">branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestspointerlockmouseeventdeliveryhtml">branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery.html</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformmacPlatformEventFactoryMacmm">branches/safari-603-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreemacEventSendingControllermm">branches/safari-603-branch/Tools/DumpRenderTree/mac/EventSendingController.mm</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnermacEventSenderProxymm">branches/safari-603-branch/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211663. rdar://problem/30343810
+
+ 2017-02-03 Jeremy Jones <jeremyj@apple.com>
+
+ WK1 mouse events are missing movementX and movementY for pointerlock.
+ https://bugs.webkit.org/show_bug.cgi?id=167775
+ rdar://problem/30343810
+
+ Reviewed by Alexey Proskuryakov.
+
+ Enable pointer-lock/mouse-event-delivery.html for mac.
+
+ * platform/mac/TestExpectations:
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211564. rdar://problem/29012252
</span><span class="cx">
</span><span class="cx"> 2017-02-02 Antti Koivisto <antti@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestspointerlockmouseeventdeliveryexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery-expected.txt (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery-expected.txt 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery-expected.txt 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -8,6 +8,9 @@
</span><span class="cx"> With a lock in place send a wheel event.
</span><span class="cx"> PASS event type: wheel, target: target1, received on: target1
</span><span class="cx"> PASS event type: wheel, target: target1, received on: body
</span><ins>+ With a lock in place move the mouse.
+PASS event type: mousemove, movementX: 25, movementY: -30, target: target1, received on: target1
+PASS event type: mousemove, movementX: 25, movementY: -30, target: target1, received on: body
</ins><span class="cx"> With a lock in place send a click.
</span><span class="cx"> PASS event type: mousedown, target: target1, received on: target1
</span><span class="cx"> PASS event type: mousedown, target: target1, received on: body
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestspointerlockmouseeventdeliveryhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery.html (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery.html 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/LayoutTests/pointer-lock/mouse-event-delivery.html 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -34,6 +34,13 @@
</span><span class="cx"> function eventExpected(e) {
</span><span class="cx"> testPassed("event type: " + e.type + ", target: " + e.target.id + ", received on: " + e.currentTarget.id);
</span><span class="cx"> }
</span><ins>+ function eventDeltaExpected(e) {
+ testPassed("event type: " + e.type + ", movementX: " + e.movementX + ", movementY: " + e.movementY + ", target: " + e.target.id + ", received on: " + e.currentTarget.id);
+ }
+ function eventDeltaExpectedThenNextStep(e) {
+ testPassed("event type: " + e.type + ", movementX: " + e.movementX + ", movementY: " + e.movementY + ", target: " + e.target.id + ", received on: " + e.currentTarget.id);
+ doNextStep();
+ }
</ins><span class="cx">
</span><span class="cx"> todo = [
</span><span class="cx"> function () {
</span><span class="lines">@@ -54,7 +61,20 @@
</span><span class="cx"> doNextStep();
</span><span class="cx"> },
</span><span class="cx"> function () {
</span><ins>+ debug(" With a lock in place move the mouse.")
+ targetdiv1.onmousemove = eventDeltaExpectedThenNextStep;
+ targetdiv2.onmousemove = eventNotExpected;
+ document.body.onmousemove = eventDeltaExpected;
+ if (window.eventSender) {
+ window.eventSender.mouseMoveTo(45,50);
+ }
+ },
+ function () {
</ins><span class="cx"> debug(" With a lock in place send a click.")
</span><ins>+ targetdiv1.onmousemove = null;
+ targetdiv2.onmousemove = null;
+ document.body.onmousemove = null;
+
</ins><span class="cx"> targetdiv1.onmousedown = eventExpected;
</span><span class="cx"> targetdiv2.onmousedown = eventNotExpected;
</span><span class="cx"> document.body.onmousedown = eventExpected;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211663. rdar://problem/30343810
+
+ 2017-02-03 Jeremy Jones <jeremyj@apple.com>
+
+ WK1 mouse events are missing movementX and movementY for pointerlock.
+ https://bugs.webkit.org/show_bug.cgi?id=167775
+ rdar://problem/30343810
+
+ Reviewed by Alexey Proskuryakov.
+
+ pointer-lock/mouse-event-delivery.html
+
+ Improve mouse-event-delivery.html test to mouse move and check for valid movementX and movementY.
+
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder): WK1 plumb throuhg movementX and movementY
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211625. rdar://problem/29168795
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Antti Koivisto <antti@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformmacPlatformEventFactoryMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -714,6 +714,9 @@
</span><span class="cx"> m_globalPosition = IntPoint(globalPointForEvent(event));
</span><span class="cx"> m_button = mouseButtonForEvent(event);
</span><span class="cx"> m_clickCount = clickCountForEvent(event);
</span><ins>+#if ENABLE(POINTER_LOCK)
+ m_movementDelta = IntPoint(event.deltaX, event.deltaY);
+#endif
</ins><span class="cx">
</span><span class="cx"> m_force = 0;
</span><span class="cx"> #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211663. rdar://problem/30343810
+
+ 2017-02-03 Jeremy Jones <jeremyj@apple.com>
+
+ WK1 mouse events are missing movementX and movementY for pointerlock.
+ https://bugs.webkit.org/show_bug.cgi?id=167775
+ rdar://problem/30343810
+
+ Reviewed by Alexey Proskuryakov.
+
+ Set kCGMouseEventDeltaX and kCGMouseEventDeltaY when synthesizing mouse move events.
+
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (-[EventSendingController mouseMoveToX:Y:]):
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (WTR::EventSenderProxy::mouseMoveTo):
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211621. rdar://problem/30221102
</span><span class="cx">
</span><span class="cx"> 2017-02-02 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreemacEventSendingControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/EventSendingController.mm (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/mac/EventSendingController.mm 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/EventSendingController.mm 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -643,9 +643,9 @@
</span><span class="cx">
</span><span class="cx"> NSView *view = [mainFrame webView];
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- lastMousePosition = [view convertPoint:NSMakePoint(x, [view frame].size.height - y) toView:nil];
</del><ins>+ NSPoint newMousePosition = [view convertPoint:NSMakePoint(x, [view frame].size.height - y) toView:nil];
</ins><span class="cx"> NSEvent *event = [NSEvent mouseEventWithType:(leftMouseButtonDown ? NSEventTypeLeftMouseDragged : NSEventTypeMouseMoved)
</span><del>- location:lastMousePosition
</del><ins>+ location:newMousePosition
</ins><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:[self currentEventTime]
</span><span class="cx"> windowNumber:[[view window] windowNumber]
</span><span class="lines">@@ -653,6 +653,11 @@
</span><span class="cx"> eventNumber:++eventNumber
</span><span class="cx"> clickCount:(leftMouseButtonDown ? clickCount : 0)
</span><span class="cx"> pressure:0.0];
</span><ins>+ CGEventRef cgEvent = event.CGEvent;
+ CGEventSetIntegerValueField(cgEvent, kCGMouseEventDeltaX, newMousePosition.x - lastMousePosition.x);
+ CGEventSetIntegerValueField(cgEvent, kCGMouseEventDeltaY, newMousePosition.y - lastMousePosition.y);
+ event = [NSEvent eventWithCGEvent:cgEvent];
+ lastMousePosition = newMousePosition;
</ins><span class="cx"> #else
</span><span class="cx"> lastMousePosition = [view convertPoint:NSMakePoint(x, y) toView:nil];
</span><span class="cx"> WebEvent *event = [[WebEvent alloc] initWithMouseEventType:WebEventMouseMoved
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (212052 => 212053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2017-02-10 06:36:15 UTC (rev 212052)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2017-02-10 06:36:19 UTC (rev 212053)
</span><span class="lines">@@ -600,12 +600,10 @@
</span><span class="cx"> void EventSenderProxy::mouseMoveTo(double x, double y)
</span><span class="cx"> {
</span><span class="cx"> NSView *view = m_testController->mainWebView()->platformView();
</span><del>- NSPoint position = [view convertPoint:NSMakePoint(x, y) toView:nil];
- m_position.x = position.x;
- m_position.y = position.y;
</del><ins>+ NSPoint newMousePosition = [view convertPoint:NSMakePoint(x, y) toView:nil];
</ins><span class="cx"> bool isDrag = m_leftMouseButtonDown;
</span><span class="cx"> NSEvent *event = [NSEvent mouseEventWithType:(isDrag ? NSEventTypeLeftMouseDragged : NSEventTypeMouseMoved)
</span><del>- location:position
</del><ins>+ location:newMousePosition
</ins><span class="cx"> modifierFlags:0
</span><span class="cx"> timestamp:absoluteTimeForEventTime(currentEventTime())
</span><span class="cx"> windowNumber:view.window.windowNumber
</span><span class="lines">@@ -614,6 +612,13 @@
</span><span class="cx"> clickCount:(m_leftMouseButtonDown ? m_clickCount : 0)
</span><span class="cx"> pressure:0];
</span><span class="cx">
</span><ins>+ CGEventRef cgEvent = event.CGEvent;
+ CGEventSetIntegerValueField(cgEvent, kCGMouseEventDeltaX, newMousePosition.x - m_position.x);
+ CGEventSetIntegerValueField(cgEvent, kCGMouseEventDeltaY, newMousePosition.y - m_position.y);
+ event = [NSEvent eventWithCGEvent:cgEvent];
+ m_position.x = newMousePosition.x;
+ m_position.y = newMousePosition.y;
+
</ins><span class="cx"> NSPoint windowLocation = event.locationInWindow;
</span><span class="cx"> // Always target drags at the WKWebView to allow for drag-scrolling outside the view.
</span><span class="cx"> NSView *targetView = isDrag ? m_testController->mainWebView()->platformView() : [m_testController->mainWebView()->platformView() hitTest:windowLocation];
</span></span></pre>
</div>
</div>
</body>
</html>