<!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>[202531] 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/202531">202531</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-27 18:13:53 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt the iOS TouchEventHandler API for cases that must have synchronous dispatch
https://bugs.webkit.org/show_bug.cgi?id=159179
rdar://problem/27006387
Reviewed by Simon Fraser.
Source/WebCore:
Tests: fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html
fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html
fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html
fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html
fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html
fast/events/touch/ios/drag-block-without-overflow-scroll.html
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction):
(WebCore::Document::removeAllEventListeners):
* dom/Node.cpp:
(WebCore::Node::willBeDeletedFrom):
(WebCore::tryAddEventListener):
(WebCore::tryRemoveEventListener):
* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::registerForTouchEvents):
(WebCore::SliderThumbElement::unregisterForTouchEvents):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::registerAsTouchEventListenerForScrolling):
(WebCore::RenderLayer::unregisterAsTouchEventListenerForScrolling):
LayoutTests:
Several of those tests expose existing bugs with overflow scrolling.
They are not using PASS/FAIL at the moment, just dump the called listeners.
* fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt: Added.
* fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html: Added.
* fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt: Added.
* fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html: Added.
* fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt: Added.
* fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt: Added.
* fast/events/touch/ios/drag-block-without-overflow-scroll.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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserveronblockscrollingstateexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserveronblockscrollingstatehtml">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserverondocumentscrollingstateexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserverondocumentscrollingstatehtml">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollscrollingstateexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollscrollingstatehtml">trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserveronblockexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserveronblockhtml">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserverondocumentexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserverondocumenthtml">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollhtml">trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-27 Benjamin Poulain <benjamin@webkit.org>
+
+ Adopt the iOS TouchEventHandler API for cases that must have synchronous dispatch
+ https://bugs.webkit.org/show_bug.cgi?id=159179
+ rdar://problem/27006387
+
+ Reviewed by Simon Fraser.
+
+ Several of those tests expose existing bugs with overflow scrolling.
+ They are not using PASS/FAIL at the moment, just dump the called listeners.
+
+ * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt: Added.
+ * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html: Added.
+ * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt: Added.
+ * fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html: Added.
+ * fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt: Added.
+ * fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt: Added.
+ * fast/events/touch/ios/drag-block-without-overflow-scroll.html: Added.
+
</ins><span class="cx"> 2016-06-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: When modifying sessionStorage, localStorage gets updated
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserveronblockscrollingstateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it even with asynchronous listeners.
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (synchronous event dispatch region for event touchend
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchstart
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchforcechange
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchmove
+ at (8,8) size 784x200)
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserveronblockscrollingstatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1">
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function runTest()
+ {
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.scrollTop = 5;
+ eventTarget.scrollTop = 0;
+ if (window.testRunner) {
+ document.getElementById("output").innerText = window.internals.scrollingStateTreeAsText();
+ testRunner.notifyDone();
+ }
+ }
+ function testSetup()
+ {
+ let eventTarget = document.getElementById("eventTarget");
+ function touchEventHandler(event) { throw "This is not supposed to happen!"; }
+ eventTarget.addEventListener('touchstart', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchmove', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchend', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchcancel', touchEventHandler, { 'passive': true });
+ setTimeout(runTest, 15);
+ }
+
+ window.addEventListener('load', testSetup, false);
+ </script>
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p>Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it even with asynchronous listeners.</p>
+ <pre id="output">
+ </pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserverondocumentscrollingstateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it even within a asynchronous dispatch region.
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (asynchronous event dispatch region
+ at (0,0) size 800x600)
+ (synchronous event dispatch region for event touchend
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchstart
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchforcechange
+ at (8,8) size 784x200)
+ (synchronous event dispatch region for event touchmove
+ at (8,8) size 784x200)
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollandpassiveobserverondocumentscrollingstatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1">
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function touchEventHandler(event) { throw "This is not supposed to happen!"; }
+ document.addEventListener('touchstart', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchmove', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchend', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchcancel', touchEventHandler, { 'passive': true });
+
+ function runTest()
+ {
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.scrollTop = 5;
+ eventTarget.scrollTop = 0;
+ if (window.testRunner) {
+ document.getElementById("output").innerText = window.internals.scrollingStateTreeAsText();
+ testRunner.notifyDone();
+ }
+ }
+
+ window.addEventListener('load', function() { setTimeout(runTest, 15); }, false);
+ </script>
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p>Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it even within a asynchronous dispatch region.</p>
+ <pre id="output">
+ </pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollscrollingstateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it.
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (synchronous event dispatch region for event touchend
+ at (0,0) size 800x200)
+ (synchronous event dispatch region for event touchstart
+ at (0,0) size 800x200)
+ (synchronous event dispatch region for event touchforcechange
+ at (0,0) size 800x200)
+ (synchronous event dispatch region for event touchmove
+ at (0,0) size 800x200)
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosblockwithoutoverflowscrollscrollingstatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ body {
+ margin: 0;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=1">
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p id="description">Verify that the block scrolling on overflow has touch event region with synchronous dispatch associated with it.</p>
+ <pre id="output">
+ </pre>
+ <script>
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+
+ function runTest()
+ {
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.scrollTop = 5;
+ eventTarget.scrollTop = 0;
+ document.getElementById("output").innerText = window.internals.scrollingStateTreeAsText();
+ testRunner.notifyDone();
+ }
+
+ window.addEventListener('load', function() { setTimeout(runTest, 15); }, false);
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserveronblockexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Test scrolling on a block without -webkit-overflow-scrolling.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+ PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop is 0
+PASS document.getElementById('eventTarget').scrollLeft is 0
+Received cancelable event touchstart at 50, 150
+Received cancelable event touchmove at 50, 50
+PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop > 0 is true
+PASS document.getElementById('eventTarget').scrollLeft is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserveronblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="../../../../resources/js-test-pre.js"></script>
+ <style>
+ body {
+ margin: 0;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=1">
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p id="description"></p>
+ <div id="console">
+ </div>
+ <script>
+ description("Test scrolling on a block without -webkit-overflow-scrolling.");
+ window.jsTestIsAsync = true;
+
+ function getDragUIScript(startX, startY, endX, endY)
+ {
+ return `
+ (function() {
+ uiController.dragFromPointToPoint(${startX}, ${startY}, ${endX}, ${endY}, 0.15, function() {
+ uiController.uiScriptComplete("Dispatched Drag");
+ });
+ })();`
+ }
+
+ function runTest()
+ {
+ function scrollEventHandler(event) {
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBeTrue("document.getElementById('eventTarget').scrollTop > 0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ finishJSTest();
+ }
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.addEventListener("scroll", scrollEventHandler);
+
+ function touchEventHandler(event) {
+ debug("Received" + (event.cancelable ? " cancelable" : "") + " event " + event.type + " at " + event.touches[0].clientX + ", " + event.touches[0].clientY);
+ }
+ eventTarget.addEventListener('touchstart', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchmove', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchend', touchEventHandler, { 'passive': true });
+ eventTarget.addEventListener('touchcancel', touchEventHandler, { 'passive': true });
+
+ if (window.testRunner) {
+ testRunner.runUIScript(getDragUIScript(50, 150, 50, 50), function(result) {
+ debug(result);
+ });
+ }
+
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBe("document.getElementById('eventTarget').scrollTop", "0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserverondocumentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Test scrolling on a block without -webkit-overflow-scrolling.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+ PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop is 0
+PASS document.getElementById('eventTarget').scrollLeft is 0
+Received cancelable event touchstart at 50, 150
+Received cancelable event touchmove at 50, 50
+PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop > 0 is true
+PASS document.getElementById('eventTarget').scrollLeft is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollandpassiveobserverondocumenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="../../../../resources/js-test-pre.js"></script>
+ <style>
+ body {
+ margin: 0;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=1">
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p id="description"></p>
+ <div id="console">
+ </div>
+ <script>
+ description("Test scrolling on a block without -webkit-overflow-scrolling.");
+ window.jsTestIsAsync = true;
+
+ function getDragUIScript(startX, startY, endX, endY)
+ {
+ return `
+ (function() {
+ uiController.dragFromPointToPoint(${startX}, ${startY}, ${endX}, ${endY}, 0.15, function() {
+ uiController.uiScriptComplete("Dispatched Drag");
+ });
+ })();`
+ }
+
+ function runTest()
+ {
+ function scrollEventHandler(event) {
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBeTrue("document.getElementById('eventTarget').scrollTop > 0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ finishJSTest();
+ }
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.addEventListener("scroll", scrollEventHandler);
+
+ function touchEventHandler(event) {
+ debug("Received" + (event.cancelable ? " cancelable" : "") + " event " + event.type + " at " + event.touches[0].clientX + ", " + event.touches[0].clientY);
+ }
+ document.addEventListener('touchstart', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchmove', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchend', touchEventHandler, { 'passive': true });
+ document.addEventListener('touchcancel', touchEventHandler, { 'passive': true });
+
+ if (window.testRunner) {
+ testRunner.runUIScript(getDragUIScript(50, 150, 50, 50), function(result) {
+ debug(result);
+ });
+ }
+
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBe("document.getElementById('eventTarget').scrollTop", "0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll-expected.txt 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Test scrolling on a block without -webkit-overflow-scrolling.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+ PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop is 0
+PASS document.getElementById('eventTarget').scrollLeft is 0
+scrollEventHandler called.
+PASS window.scrollX is 0
+PASS window.scrollY is 0
+PASS document.documentElement.scrollTop is 0
+PASS document.documentElement.scrollLeft is 0
+PASS document.getElementById('eventTarget').scrollTop > 0 is true
+PASS document.getElementById('eventTarget').scrollLeft is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiosdragblockwithoutoverflowscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll.html (0 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/drag-block-without-overflow-scroll.html 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="../../../../resources/js-test-pre.js"></script>
+ <style>
+ body {
+ margin: 0;
+ }
+ </style>
+ <meta name="viewport" content="initial-scale=1">
+</head>
+<body>
+ <div id="eventTarget" style="overflow: scroll; height: 200px">
+ <div style="height: 3000px"></div>
+ </div>
+ <p id="description"></p>
+ <div id="console">
+ </div>
+ <script>
+ description("Test scrolling on a block without -webkit-overflow-scrolling.");
+ window.jsTestIsAsync = true;
+
+ function getDragUIScript(startX, startY, endX, endY)
+ {
+ return `
+ (function() {
+ uiController.dragFromPointToPoint(${startX}, ${startY}, ${endX}, ${endY}, 0.15, function() {
+ uiController.uiScriptComplete("Dispatched Drag");
+ });
+ })();`
+ }
+
+ function runTest()
+ {
+ function scrollEventHandler(event) {
+ debug("scrollEventHandler called.");
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBeTrue("document.getElementById('eventTarget').scrollTop > 0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ finishJSTest();
+ }
+ let eventTarget = document.getElementById("eventTarget");
+ eventTarget.addEventListener("scroll", scrollEventHandler);
+
+ if (window.testRunner) {
+ testRunner.runUIScript(getDragUIScript(50, 150, 50, 50), function(result) { });
+ }
+
+ shouldBe("window.scrollX", "0");
+ shouldBe("window.scrollY", "0");
+ shouldBe("document.documentElement.scrollTop", "0");
+ shouldBe("document.documentElement.scrollLeft", "0");
+ shouldBe("document.getElementById('eventTarget').scrollTop", "0");
+ shouldBe("document.getElementById('eventTarget').scrollLeft", "0");
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+ <script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/Source/WebCore/ChangeLog 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-06-27 Benjamin Poulain <benjamin@webkit.org>
+
+ Adopt the iOS TouchEventHandler API for cases that must have synchronous dispatch
+ https://bugs.webkit.org/show_bug.cgi?id=159179
+ rdar://problem/27006387
+
+ Reviewed by Simon Fraser.
+
+ Tests: fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-block-scrolling-state.html
+ fast/events/touch/ios/block-without-overflow-scroll-and-passive-observer-on-document-scrolling-state.html
+ fast/events/touch/ios/block-without-overflow-scroll-scrolling-state.html
+ fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-block.html
+ fast/events/touch/ios/drag-block-without-overflow-scroll-and-passive-observer-on-document.html
+ fast/events/touch/ios/drag-block-without-overflow-scroll.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction):
+ (WebCore::Document::removeAllEventListeners):
+ * dom/Node.cpp:
+ (WebCore::Node::willBeDeletedFrom):
+ (WebCore::tryAddEventListener):
+ (WebCore::tryRemoveEventListener):
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::registerForTouchEvents):
+ (WebCore::SliderThumbElement::unregisterForTouchEvents):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::registerAsTouchEventListenerForScrolling):
+ (WebCore::RenderLayer::unregisterAsTouchEventListenerForScrolling):
+
</ins><span class="cx"> 2016-06-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -2332,7 +2332,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- clearTouchEventListeners();
</del><ins>+ clearTouchEventHandlersAndListeners();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="lines">@@ -2401,7 +2401,7 @@
</span><span class="cx"> if (m_domWindow)
</span><span class="cx"> m_domWindow->removeAllEventListeners();
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- clearTouchEventListeners();
</del><ins>+ clearTouchEventHandlersAndListeners();
</ins><span class="cx"> #endif
</span><span class="cx"> for (Node* node = firstChild(); node; node = NodeTraversal::next(*node))
</span><span class="cx"> node->removeAllEventListeners();
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -317,6 +317,7 @@
</span><span class="cx"> document.didRemoveWheelEventHandler(*this, EventHandlerRemoval::All);
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
</span><span class="cx"> document.removeTouchEventListener(this, true);
</span><ins>+ document.removeTouchEventHandler(this, true);
</ins><span class="cx"> #else
</span><span class="cx"> // FIXME: This should call didRemoveTouchEventHandler().
</span><span class="cx"> #endif
</span><span class="lines">@@ -1933,7 +1934,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_GESTURE_EVENTS) && ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (eventType == eventNames().gesturestartEvent || eventType == eventNames().gesturechangeEvent || eventType == eventNames().gestureendEvent)
</span><del>- targetNode->document().addTouchEventListener(targetNode);
</del><ins>+ targetNode->document().addTouchEventHandler(targetNode);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -1974,7 +1975,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_GESTURE_EVENTS) && ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (eventType == eventNames().gesturestartEvent || eventType == eventNames().gesturechangeEvent || eventType == eventNames().gestureendEvent)
</span><del>- targetNode->document().removeTouchEventListener(targetNode);
</del><ins>+ targetNode->document().removeTouchEventHandler(targetNode);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(shouldAcceptTouchEvents());
</span><span class="cx">
</span><del>- document().addTouchEventListener(this);
</del><ins>+ document().addTouchEventHandler(this);
</ins><span class="cx"> m_isRegisteredAsTouchEventListener = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> clearExclusiveTouchIdentifier();
</span><span class="cx"> stopDragging();
</span><span class="cx">
</span><del>- document().removeTouchEventListener(this);
</del><ins>+ document().removeTouchEventHandler(this);
</ins><span class="cx"> m_isRegisteredAsTouchEventListener = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (202530 => 202531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-06-28 01:00:25 UTC (rev 202530)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-06-28 01:13:53 UTC (rev 202531)
</span><span class="lines">@@ -2188,7 +2188,7 @@
</span><span class="cx"> if (!renderer().element() || m_registeredAsTouchEventListenerForScrolling)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- renderer().document().addTouchEventListener(renderer().element());
</del><ins>+ renderer().document().addTouchEventHandler(renderer().element());
</ins><span class="cx"> m_registeredAsTouchEventListenerForScrolling = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2197,7 +2197,7 @@
</span><span class="cx"> if (!renderer().element() || !m_registeredAsTouchEventListenerForScrolling)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- renderer().document().removeTouchEventListener(renderer().element());
</del><ins>+ renderer().document().removeTouchEventHandler(renderer().element());
</ins><span class="cx"> m_registeredAsTouchEventListenerForScrolling = false;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(IOS_TOUCH_EVENTS)
</span></span></pre>
</div>
</div>
</body>
</html>