<!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>[210941] 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/210941">210941</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2017-01-19 15:30:33 -0800 (Thu, 19 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Additional selection tests and interpolation fix
https://bugs.webkit.org/show_bug.cgi?id=167171
Reviewed by Simon Fraser.
Tools:
We weren't adding the final event when interpolating event streams.
* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator interpolatedEvents:]):
LayoutTests:
Selections tests for dragging left and right.
Factored out common functions used across tests.
* fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt: Added.
* fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html: Added.
* fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt: Added.
* fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html: Added.
* fast/events/touch/ios/resources: Added.
* fast/events/touch/ios/resources/basic-gestures.js: Added.
(pressAtPoint):
(dragFromPointToPoint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosHIDEventGeneratormm">trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchioslongpressthendraglefttochangeselectedtextexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioslongpressthendraglefttochangeselectedtexthtml">trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioslongpressthendragrighttochangeselectedtextexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioslongpressthendragrighttochangeselectedtexthtml">trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html</a></li>
<li>trunk/LayoutTests/fast/events/touch/ios/resources/</li>
<li><a href="#trunkLayoutTestsfasteventstouchiosresourcesbasicgesturesjs">trunk/LayoutTests/fast/events/touch/ios/resources/basic-gestures.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210940 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-19 23:09:38 UTC (rev 210940)
+++ trunk/LayoutTests/ChangeLog 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-19 Megan Gardner <megan_gardner@apple.com>
+
+ Additional selection tests and interpolation fix
+ https://bugs.webkit.org/show_bug.cgi?id=167171
+
+ Reviewed by Simon Fraser.
+
+ Selections tests for dragging left and right.
+ Factored out common functions used across tests.
+
+ * fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt: Added.
+ * fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html: Added.
+ * fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt: Added.
+ * fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html: Added.
+ * fast/events/touch/ios/resources: Added.
+ * fast/events/touch/ios/resources/basic-gestures.js: Added.
+ (pressAtPoint):
+ (dragFromPointToPoint):
+
</ins><span class="cx"> 2017-01-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure HTML validation bubble gets dismissed when its associated element's frame gets detached
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioslongpressthendraglefttochangeselectedtextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt (0 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text-expected.txt 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioslongpressthendraglefttochangeselectedtexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html (0 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-left-to-change-selected-text.html 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="resources/basic-gestures.js"></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function runTest()
+ {
+ if (!testRunner.runUIScript)
+ return;
+
+ var output = '';
+ var target = document.getElementById('target');
+
+ if (testRunner.runUIScript) {
+ testRunner.runUIScript(pressAtPoint(181, 104), function(result) {
+ if (document.getSelection().toString() == "aliqua")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select a word as a result of a long press';
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(149,90,84,90), function(result) {
+ if (document.getSelection().toString() == "magna aliqua")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select additional line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(84,90,8,90), function(result) {
+ if (document.getSelection().toString() == "dolore magna aliqua")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select additional line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(8,90,84,90), function(result) {
+ if (document.getSelection().toString() == "magna aliqua")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to deselect line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(84,90,149,90), function(result) {
+ if (document.getSelection().toString() == "aliqua")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to deselect line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(149,90,250,90), function(result) {
+ if (document.getSelection().toString() == "a")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to reduce selection to a single character by dragging up.'
+ output += '<br>';
+ output += result;
+ document.getElementById('target').innerHTML = output;
+ testRunner.notifyDone();
+ });
+ });
+ });
+ });
+ });
+ });
+ }
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <style>
+ #target {
+ height: 400px;
+ width: 300px;
+ background-color: silver;
+ font-family: monospace;
+ font-size: 18px;
+ }
+ </style>
+</head>
+<body>
+<div id="target">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+ This test requires UIScriptController to run.
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioslongpressthendragrighttochangeselectedtextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt (0 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text-expected.txt 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+PASS: Correct Selection
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioslongpressthendragrighttochangeselectedtexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html (0 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/long-press-then-drag-right-to-change-selected-text.html 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="resources/basic-gestures.js"></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function runTest()
+ {
+ if (!testRunner.runUIScript)
+ return;
+
+ var output = '';
+ var target = document.getElementById('target');
+
+ if (testRunner.runUIScript) {
+ testRunner.runUIScript(pressAtPoint(110, 104), function(result) {
+ if (document.getSelection().toString() == "magna")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select a word as a result of a long press';
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(139,120,224,120), function(result) {
+ if (document.getSelection().toString() == "magna aliqua.")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select additional line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(224,120,255,120), function(result) {
+ if (document.getSelection().toString() == "magna aliqua. Ut ")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to select additional line after a drag.' + document.getSelection().toString()+'/end'
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(255,120,224,120), function(result) {
+ if (document.getSelection().toString() == "magna aliqua.")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to deselect line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(224,120,139,120), function(result) {
+ if (document.getSelection().toString() == "magna")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to deselect line after a drag.' + document.getSelection().toString()
+ output += '<br>';
+
+ testRunner.runUIScript(dragFromPointToPoint(139,120,40,120), function(result) {
+ if (document.getSelection().toString() == "m")
+ output += 'PASS: Correct Selection';
+ else
+ output += 'FAIL: failed to reduce selection to a single character by dragging up.'
+ output += '<br>';
+ output += result;
+ document.getElementById('target').innerHTML = output;
+ testRunner.notifyDone();
+ });
+ });
+ });
+ });
+ });
+ });
+ }
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <style>
+ #target {
+ height: 400px;
+ width: 300px;
+ background-color: silver;
+ font-family: monospace;
+ font-size: 18px;
+ }
+ </style>
+</head>
+<body>
+<div id="target">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+
+ This test requires UIScriptController to run.
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosresourcesbasicgesturesjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/resources/basic-gestures.js (0 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/resources/basic-gestures.js (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/resources/basic-gestures.js 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+function pressAtPoint(x, y)
+{
+ return `
+ (function() {
+ uiController.longPressAtPoint(${x}, ${y}, function() {
+ uiController.uiScriptComplete();
+ });
+ })();`
+}
+
+function dragFromPointToPoint(startX, startY, endX, endY)
+{
+ return `
+ (function() {
+ var eventStream = {
+ events : [
+ {
+ interpolate : "linear",
+ timestep: 0.1,
+ coordinateSpace : "content",
+ startEvent : {
+ inputType : "hand",
+ timeOffset : 0,
+ touches : [
+ {
+ inputType : "finger",
+ phase : "began",
+ id : 1,
+ x : ${startX},
+ y : ${startY},
+ pressure : 0
+ }
+ ]
+ },
+ endEvent : {
+ inputType : "hand",
+ timeOffset : 0.5,
+ touches : [
+ {
+ inputType : "finger",
+ phase : "moved",
+ id : 1,
+ x : ${endX},
+ y : ${endY},
+ pressure : 0
+ }
+ ]
+ }
+ }]};
+
+ uiController.sendEventStream(JSON.stringify(eventStream), function() {});
+ uiController.uiScriptComplete();
+ })();`
+}
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210940 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-19 23:09:38 UTC (rev 210940)
+++ trunk/Tools/ChangeLog 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-19 Megan Gardner <megan_gardner@apple.com>
+
+ Additional selection tests and interpolation fix
+ https://bugs.webkit.org/show_bug.cgi?id=167171
+
+ Reviewed by Simon Fraser.
+
+ We weren't adding the final event when interpolating event streams.
+
+ * WebKitTestRunner/ios/HIDEventGenerator.mm:
+ (-[HIDEventGenerator interpolatedEvents:]):
+
</ins><span class="cx"> 2017-01-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Variation fonts are erroneously disabled on iOS
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosHIDEventGeneratormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (210940 => 210941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-01-19 23:09:38 UTC (rev 210940)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-01-19 23:30:33 UTC (rev 210941)
</span><span class="lines">@@ -1031,6 +1031,8 @@
</span><span class="cx"> [newEvent release];
</span><span class="cx"> time += timeStep;
</span><span class="cx"> }
</span><ins>+
+ [interpolatedEvents addObject:endEvent];
</ins><span class="cx">
</span><span class="cx"> return interpolatedEvents;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>