<!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>[210656] branches/safari-603-branch/LayoutTests</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/210656">210656</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 08:45:56 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210538">r210538</a>. rdar://problem/29941747</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsTestExpectations">branches/safari-603-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestsresourcesuihelperjs">branches/safari-603-branch/LayoutTests/resources/ui-helper.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomtoucheventontextassignedtoslotexpectedtxt">branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomtoucheventontextassignedtoslothtml">branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot.html</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 (210655 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-12 16:45:53 UTC (rev 210655)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210538. rdar://problem/29941747
+
+ 2017-01-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ Add an iOS test for tapping on a text node assigned to a slot
+ https://bugs.webkit.org/show_bug.cgi?id=166877
+
+ Reviewed by Andy Estes.
+
+ Add a test for tapping on a text node assigned to a slot.
+ touchstart event must be fired on a parent of the slot with a touch event handler.
+
+ * TestExpectations:
+ * fast/shadow-dom/touch-event-on-text-assigned-to-slot-expected.txt: Added.
+ * fast/shadow-dom/touch-event-on-text-assigned-to-slot.html: Added.
+ * resources/ui-helper.js:
+ (window.UIHelper.tapAt): Added.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210516. rdar://problem/28693432
</span><span class="cx">
</span><span class="cx"> 2017-01-09 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/TestExpectations (210655 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/TestExpectations 2017-01-12 16:45:53 UTC (rev 210655)
+++ branches/safari-603-branch/LayoutTests/TestExpectations 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> media/controls/ipad [ Skip ]
</span><span class="cx"> fast/text-autosizing [ Skip ]
</span><span class="cx">
</span><ins>+fast/shadow-dom/touch-event-on-text-assigned-to-slot.html [ Skip ]
+
</ins><span class="cx"> fast/forms/attributed-strings.html [ Skip ]
</span><span class="cx"> fast/scrolling/latching [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomtoucheventontextassignedtoslotexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot-expected.txt (0 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot-expected.txt 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Tests for tapping on a text node assigned to a slot. touchstart should fire on the slot.
+
+Tap here
+PASS
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomtoucheventontextassignedtoslothtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot.html (0 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/touch-event-on-text-assigned-to-slot.html 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Tests for tapping on a text node assigned to a slot. touchstart should fire on the slot.</p>
+<div id="target">Tap here</div>
+<div id="result"></div>
+<script src="../../resources/ui-helper.js"></script>
+<script>
+
+var target = document.getElementById('target');
+var result = document.getElementById('result');
+
+let shadowRoot = target.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = `<span><slot></slot></span>`;
+shadowRoot.querySelector('span').addEventListener('touchstart', (event) => {
+ result.textContent = 'PASS';
+});
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ UIHelper.wait(UIHelper.tapAt(target.offsetLeft + 5, target.offsetTop + 5).then(() => {
+ if (!result.textContent)
+ result.textContent = 'FAIL';
+ }));
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations (210655 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations 2017-01-12 16:45:53 UTC (rev 210655)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> # No touch events
</span><span class="cx"> fast/events/touch [ Skip ]
</span><span class="cx"> fast/shadow-dom/touch-event-ios.html [ Skip ]
</span><ins>+fast/shadow-dom/touch-event-on-text-assigned-to-slot.html [ Skip ]
</ins><span class="cx"> http/tests/quicklook/at-import-stylesheet-blocked.html [ Skip ]
</span><span class="cx"> http/tests/quicklook/base-url-blocked.html [ Skip ]
</span><span class="cx"> http/tests/quicklook/cross-origin-iframe-blocked.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsresourcesuihelperjs"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/resources/ui-helper.js (210655 => 210656)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/resources/ui-helper.js 2017-01-12 16:45:53 UTC (rev 210655)
+++ branches/safari-603-branch/LayoutTests/resources/ui-helper.js 2017-01-12 16:45:56 UTC (rev 210656)
</span><span class="lines">@@ -10,6 +10,26 @@
</span><span class="cx"> return window.testRunner.isWebKit2;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static tapAt(x, y)
+ {
+ console.assert(this.isIOS());
+
+ if (!this.isWebKit2()) {
+ eventSender.addTouchPoint(x, y);
+ eventSender.touchStart();
+ eventSender.releaseTouchPoint(0);
+ eventSender.touchEnd();
+ return Promise.resolve();
+ }
+
+ return new Promise((resolve) => {
+ testRunner.runUIScript(`
+ uiController.singleTapAtPoint(${x}, ${y}, function() {
+ uiController.uiScriptComplete('Done');
+ });`, resolve);
+ });
+ }
+
</ins><span class="cx"> static activateAt(x, y)
</span><span class="cx"> {
</span><span class="cx"> if (!this.isWebKit2() || !this.isIOS()) {
</span></span></pre>
</div>
</div>
</body>
</html>