<!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>[243281] trunk/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/243281">243281</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2019-03-21 01:25:18 -0700 (Thu, 21 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use immediateScrollElementAtContentPointToOffset for scroll overlap tests
https://bugs.webkit.org/show_bug.cgi?id=195943

Reviewed by Simon Fraser.

This is much faster and simpler than simulated touch events.

* fast/scrolling/ios/overflow-scroll-overlap-2.html:
* fast/scrolling/ios/overflow-scroll-overlap-3.html:
* fast/scrolling/ios/overflow-scroll-overlap-4.html:
* fast/scrolling/ios/overflow-scroll-overlap.html:

This API doesn't respect touch-action property, so stop using it. Instead restore
the main scrollview to the initial position explicitly after scroll.

* fast/scrolling/resources/overflow-scroll-overlap.js:
(async.runTest):
* resources/ui-helper.js:
(return.new.Promise.):
(return.new.Promise):

Add a Promise returning helper.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlap2html">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-2.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3html">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlap4html">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-4.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlaphtml">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingresourcesoverflowscrolloverlapjs">trunk/LayoutTests/fast/scrolling/resources/overflow-scroll-overlap.js</a></li>
<li><a href="#trunkLayoutTestsresourcesuihelperjs">trunk/LayoutTests/resources/ui-helper.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/ChangeLog 2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2019-03-21  Antti Koivisto  <antti@apple.com>
+
+        Use immediateScrollElementAtContentPointToOffset for scroll overlap tests
+        https://bugs.webkit.org/show_bug.cgi?id=195943
+
+        Reviewed by Simon Fraser.
+
+        This is much faster and simpler than simulated touch events.
+
+        * fast/scrolling/ios/overflow-scroll-overlap-2.html:
+        * fast/scrolling/ios/overflow-scroll-overlap-3.html:
+        * fast/scrolling/ios/overflow-scroll-overlap-4.html:
+        * fast/scrolling/ios/overflow-scroll-overlap.html:
+
+        This API doesn't respect touch-action property, so stop using it. Instead restore
+        the main scrollview to the initial position explicitly after scroll.
+
+        * fast/scrolling/resources/overflow-scroll-overlap.js:
+        (async.runTest):
+        * resources/ui-helper.js:
+        (return.new.Promise.):
+        (return.new.Promise):
+
+        Add a Promise returning helper.
+
</ins><span class="cx"> 2019-03-20  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Compute quota after network process restart based on default quota and space used
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlap2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-2.html (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-2.html      2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-2.html 2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -2,10 +2,9 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="width=device-width, initial-scale=1">
</span><ins>+<script src="../../../resources/ui-helper.js"></script>
+<script src="../resources/overflow-scroll-overlap.js"></script>
</ins><span class="cx"> <style>
</span><del>-body {
-    touch-action: none;
-}
</del><span class="cx"> .case {
</span><span class="cx">     width: 200px;
</span><span class="cx">     height: 200px;
</span><span class="lines">@@ -56,8 +55,6 @@
</span><span class="cx">     white-space: pre;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script src="../../../resources/basic-gestures.js"></script>
-<script src="../resources/overflow-scroll-overlap.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><span class="cx"> <p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html      2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html 2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -2,10 +2,9 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="width=device-width, initial-scale=1">
</span><ins>+<script src="../../../resources/ui-helper.js"></script>
+<script src="../resources/overflow-scroll-overlap.js"></script>
</ins><span class="cx"> <style>
</span><del>-body {
-    touch-action: none;
-}
</del><span class="cx"> .case {
</span><span class="cx">     width: 200px;
</span><span class="cx">     height: 200px;
</span><span class="lines">@@ -48,8 +47,6 @@
</span><span class="cx">     white-space: pre;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script src="../../../resources/basic-gestures.js"></script>
-<script src="../resources/overflow-scroll-overlap.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><span class="cx"> <p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlap4html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-4.html (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-4.html      2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-4.html 2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -2,10 +2,9 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="width=device-width, initial-scale=1">
</span><ins>+<script src="../../../resources/ui-helper.js"></script>
+<script src="../resources/overflow-scroll-overlap.js"></script>
</ins><span class="cx"> <style>
</span><del>-body {
-    touch-action: none;
-}
</del><span class="cx"> .case {
</span><span class="cx">     width: 200px;
</span><span class="cx">     height: 200px;
</span><span class="lines">@@ -48,8 +47,6 @@
</span><span class="cx">     white-space: pre;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script src="../../../resources/basic-gestures.js"></script>
-<script src="../resources/overflow-scroll-overlap.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><span class="cx"> <p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlaphtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap.html (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap.html        2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap.html   2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -2,10 +2,9 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="width=device-width, initial-scale=1">
</span><ins>+<script src="../../../resources/ui-helper.js"></script>
+<script src="../resources/overflow-scroll-overlap.js"></script>
</ins><span class="cx"> <style>
</span><del>-body {
-    touch-action: none;
-}
</del><span class="cx"> .case {
</span><span class="cx">     width: 150px;
</span><span class="cx">     height: 150px;
</span><span class="lines">@@ -48,8 +47,6 @@
</span><span class="cx">     white-space: pre;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<script src="../../../resources/basic-gestures.js"></script>
-<script src="../resources/overflow-scroll-overlap.js"></script>
</del><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><span class="cx"> <p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingresourcesoverflowscrolloverlapjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/resources/overflow-scroll-overlap.js (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/resources/overflow-scroll-overlap.js    2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/fast/scrolling/resources/overflow-scroll-overlap.js       2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -46,10 +46,13 @@
</span><span class="cx">             const rect = target.getBoundingClientRect();
</span><span class="cx">             const centerX = (rect.left + rect.right) / 2;
</span><span class="cx">             const centerY = (rect.top + rect.bottom) / 2;
</span><del>-            await touchAndDragFromPointToPoint(centerX, centerY, centerX, centerY - 30);
-            await liftUpAtPoint(centerX, centerY - 30);
-            await sleep(500);
</del><ins>+            await UIHelper.immediateScrollElementAtContentPointToOffset(centerX, centerY, 0, 30);
+            
+            // Restore the main scroll view to the original position in case it moved.
+            await UIHelper.immediateScrollElementAtContentPointToOffset(5, 5, 0, 0);
</ins><span class="cx"> 
</span><ins>+            await UIHelper.ensurePresentationUpdate();
+
</ins><span class="cx">             testcase.style.display = 'none';
</span><span class="cx">             outputCase(i);
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkLayoutTestsresourcesuihelperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/ui-helper.js (243280 => 243281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/ui-helper.js 2019-03-21 07:51:12 UTC (rev 243280)
+++ trunk/LayoutTests/resources/ui-helper.js    2019-03-21 08:25:18 UTC (rev 243281)
</span><span class="lines">@@ -286,6 +286,17 @@
</span><span class="cx">         });
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    static immediateScrollElementAtContentPointToOffset(x, y, scrollX, scrollY)
+    {
+        if (!this.isWebKit2())
+            return Promise.resolve();
+
+        return new Promise(resolve => {
+            testRunner.runUIScript(`
+                uiController.immediateScrollElementAtContentPointToOffset(${x}, ${y}, ${scrollX}, ${scrollY});`, resolve);
+        });
+    }
+
</ins><span class="cx">     static ensureVisibleContentRectUpdate()
</span><span class="cx">     {
</span><span class="cx">         if (!this.isWebKit2())
</span></span></pre>
</div>
</div>

</body>
</html>