<!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>[189922] 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/189922">189922</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 12:22:01 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a test ensuring that scrolling in the middle of a page can't start a swipe gesture
https://bugs.webkit.org/show_bug.cgi?id=148904
Reviewed by Myles Maxfield.
* swipe/main-frame-pinning-requirement.html: Added.
* WebKitTestRunner/TestController.cpp:
(WTR::parseBooleanTestHeaderValue):
(WTR::updateViewOptionsFromTestHeader):
Check for the key "useThreadedScrolling".
Add some code to check for "true" and "false" for boolean options.
(WTR::TestController::viewOptionsForTest):
Apply the test's overrides last, even after the platform's.</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="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsswipemainframepinningrequirementexpectedtxt">trunk/LayoutTests/swipe/main-frame-pinning-requirement-expected.txt</a></li>
<li><a href="#trunkLayoutTestsswipemainframepinningrequirementhtml">trunk/LayoutTests/swipe/main-frame-pinning-requirement.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189921 => 189922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-17 19:00:13 UTC (rev 189921)
+++ trunk/LayoutTests/ChangeLog 2015-09-17 19:22:01 UTC (rev 189922)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-17 Tim Horton <timothy_horton@apple.com>
+
+ Add a test ensuring that scrolling in the middle of a page can't start a swipe gesture
+ https://bugs.webkit.org/show_bug.cgi?id=148904
+
+ Reviewed by Myles Maxfield.
+
+ * swipe/main-frame-pinning-requirement.html: Added.
+
</ins><span class="cx"> 2015-09-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> column-rule-style: outset/inset doesn't work
</span></span></pre></div>
<a id="trunkLayoutTestsswipemainframepinningrequirementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/swipe/main-frame-pinning-requirement-expected.txt (0 => 189922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/swipe/main-frame-pinning-requirement-expected.txt (rev 0)
+++ trunk/LayoutTests/swipe/main-frame-pinning-requirement-expected.txt 2015-09-17 19:22:01 UTC (rev 189922)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+swipe event (delta 0 0, phase 'maybegin')
+scroll event (delta 10 0, phase 'began')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 10 0, phase 'changed')
+scroll event (delta 0 0, phase 'ended')
+swipe event (delta 0 0, phase 'maybegin')
+scroll event (delta 1 0, phase 'began')
+scroll event (delta 10 0, phase 'changed')
+didBeginSwipe
+swipe event (delta 1 0, phase 'changed')
+swipe event (delta 256 0, phase 'changed')
+swipe event (delta 0 0, phase 'ended')
+willEndSwipe
+didEndSwipe
+didRemoveSwipeSnapshot
+
</ins></span></pre></div>
<a id="trunkLayoutTestsswipemainframepinningrequirementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/swipe/main-frame-pinning-requirement.html (0 => 189922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/swipe/main-frame-pinning-requirement.html (rev 0)
+++ trunk/LayoutTests/swipe/main-frame-pinning-requirement.html 2015-09-17 19:22:01 UTC (rev 189922)
</span><span class="lines">@@ -0,0 +1,135 @@
</span><ins>+<!-- webkit-test-runner [ useThreadedScrolling=true ] -->
+<!-- This test has to use threaded scrolling because we don't
+properly support swipe pinning with the antique scrolling path. -->
+
+<head>
+<style>
+html {
+ font-size: 32pt;
+}
+</style>
+<script src="resources/swipe-test.js"></script>
+<script>
+function startSwipeGesture()
+{
+ eventSender.mouseMoveTo(100, 100);
+
+ // The first swipe should fail because we're scrolled to the middle of the document
+ // and this is all a single gesture. We can only start swipes if we *begin*
+ // pinned to the edge.
+ eventQueue.enqueueSwipeEvent(0, 0, 'maybegin');
+ eventQueue.enqueueScrollEvent(10, 0, 'began');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ eventQueue.enqueueScrollEvent(0, 0, 'ended');
+
+ eventQueue.callAfterEventDispatch(function () {
+ testRunner.clearTestRunnerCallbacks();
+ testRunner.installDidBeginSwipeCallback(didBeginSwipeCallback);
+ testRunner.installWillEndSwipeCallback(willEndSwipeCallback);
+ testRunner.installDidEndSwipeCallback(didEndSwipeCallback);
+ testRunner.installDidRemoveSwipeSnapshotCallback(didRemoveSwipeSnapshotCallback);
+
+ setTimeout(function () {
+ // The second swipe should succeed because we are now scrolled to the left edge.
+ eventQueue.enqueueSwipeEvent(0, 0, 'maybegin');
+ eventQueue.enqueueScrollEvent(1, 0, 'began');
+ eventQueue.enqueueScrollEvent(10, 0, 'changed');
+ }, 0);
+ })
+}
+
+function completeSwipeGesture()
+{
+ eventQueue.enqueueSwipeEvent(1, 0, 'changed');
+ eventQueue.enqueueSwipeEvent(256, 0, 'changed');
+ eventQueue.enqueueSwipeEvent(0, 0, 'ended');
+}
+
+function didBeginSwipeNotReachedCallback()
+{
+ log("Failure. Should never begin a swipe, because we were in the middle of a scrolling gesture that started when the main frame was not pinned to the left.");
+}
+
+function didBeginSwipeCallback()
+{
+ log("didBeginSwipe");
+
+ shouldBe(false, eventQueue.hasPendingEvents(), "Event queue should be empty. Both scroll events should be required to start the swipe because of the swipe-start hysteresis.");
+
+ completeSwipeGesture();
+}
+
+function willEndSwipeCallback()
+{
+ log("willEndSwipe");
+
+ shouldBe(false, isFirstPage(), "The swipe should not yet have navigated away from the second page.");
+}
+
+function didEndSwipeCallback()
+{
+ log("didEndSwipe");
+
+ shouldBe(0, eventQueue.hasPendingEvents(), "Event queue should be empty. The swipe isn't complete until we see the end of the gesture.");
+ startMeasuringDuration("snapshotRemoval");
+}
+
+function didRemoveSwipeSnapshotCallback()
+{
+ log("didRemoveSwipeSnapshot");
+
+ shouldBe(true, isFirstPage(), "The swipe should have navigated back to the first page.");
+ measuredDurationShouldBeLessThan("snapshotRemoval", 1000, "Because we're using the page cache, it shouldn't be long between the gesture completing and the snapshot being removed.")
+
+ testComplete();
+}
+
+function isFirstPage()
+{
+ return window.location.href.indexOf("second") == -1;
+}
+
+window.onload = function () {
+ if (!window.eventSender || !window.testRunner) {
+ document.getElementById("large").innerHTML = "This test must be run in WebKitTestRunner.";
+ return;
+ }
+
+ document.getElementById("large").innerHTML = isFirstPage() ? "first" : "second";
+
+ if (isFirstPage()) {
+ initializeSwipeTest();
+
+ testRunner.installDidBeginSwipeCallback(didBeginSwipeNotReachedCallback);
+ testRunner.installWillEndSwipeCallback(willEndSwipeCallback);
+ testRunner.installDidEndSwipeCallback(didEndSwipeCallback);
+ testRunner.installDidRemoveSwipeSnapshotCallback(didRemoveSwipeSnapshotCallback);
+
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+
+ setTimeout(function () {
+ window.location.href = window.location.href + "?second";
+ }, 0);
+ return;
+ }
+
+ // Second page loaded.
+ window.scrollTo(1000, 0);
+ startSwipeGesture();
+};
+</script>
+</head>
+<body>
+<div id="large" style="width: 2000px; height: 2000px;"></div>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189921 => 189922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-17 19:00:13 UTC (rev 189921)
+++ trunk/Tools/ChangeLog 2015-09-17 19:22:01 UTC (rev 189922)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-17 Tim Horton <timothy_horton@apple.com>
+
+ Add a test ensuring that scrolling in the middle of a page can't start a swipe gesture
+ https://bugs.webkit.org/show_bug.cgi?id=148904
+
+ Reviewed by Myles Maxfield.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::parseBooleanTestHeaderValue):
+ (WTR::updateViewOptionsFromTestHeader):
+ Check for the key "useThreadedScrolling".
+ Add some code to check for "true" and "false" for boolean options.
+
+ (WTR::TestController::viewOptionsForTest):
+ Apply the test's overrides last, even after the platform's.
+
</ins><span class="cx"> 2015-09-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> printing does not use minimum page zoom factor
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (189921 => 189922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-17 19:00:13 UTC (rev 189921)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-09-17 19:22:01 UTC (rev 189922)
</span><span class="lines">@@ -827,6 +827,17 @@
</span><span class="cx"> return std::string();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool parseBooleanTestHeaderValue(const std::string& value)
+{
+ if (value == "true")
+ return true;
+ if (value == "false")
+ return false;
+
+ LOG_ERROR("Found unexpected value '%s' for boolean option. Expected 'true' or 'false'.", value.c_str());
+ return false;
+}
+
</ins><span class="cx"> static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const TestInvocation& test)
</span><span class="cx"> {
</span><span class="cx"> std::string filename = testPath(test.url());
</span><span class="lines">@@ -863,6 +874,8 @@
</span><span class="cx"> auto value = pairString.substr(equalsLocation + 1, pairEnd - (equalsLocation + 1));
</span><span class="cx"> if (key == "language")
</span><span class="cx"> String(value.c_str()).split(",", false, testOptions.overrideLanguages);
</span><ins>+ if (key == "useThreadedScrolling")
+ testOptions.useThreadedScrolling = parseBooleanTestHeaderValue(value);
</ins><span class="cx"> pairStart = pairEnd + 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -875,10 +888,10 @@
</span><span class="cx"> options.shouldShowWebView = m_shouldShowWebView;
</span><span class="cx"> options.useFixedLayout = shouldUseFixedLayout(test);
</span><span class="cx">
</span><ins>+ updatePlatformSpecificTestOptionsForTest(options, test);
+
</ins><span class="cx"> updateTestOptionsFromTestHeader(options, test);
</span><span class="cx">
</span><del>- updatePlatformSpecificTestOptionsForTest(options, test);
-
</del><span class="cx"> return options;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>