third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html - Issue 2126323002: Add support for touch-action: pinch-zoom.

Unified Diff: third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html

Issue 2126323002: Add support for touch-action: pinch-zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check in scroll begin for pointer count and add test Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/fast/css/touch-action-parsing.html ('K') | « third_party/WebKit/LayoutTests/fast/css/touch-action-parsing-expected.txt ('k') | third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_common_input.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html

diff --git a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-up-css_touch-manual.html b/third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html

similarity index 74%

copy from third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-up-css_touch-manual.html

copy to third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html

index 0902700d2de1af661399975ebcc830a54b2dfeb0..1baa706a0ed10f21a32e7735d2b5fbc472da9d67 100644

--- a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-up-css_touch-manual.html

+++ b/third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html

@@ -1,24 +1,24 @@

<!doctype html>

<html>

<head>

- <title>touch-action: pan-up</title>

- <meta name="assert" content="TA15.4 - With `touch-action: pan-up` on a swiped or click/dragged element, only panning in the y-axis up direction should be possible.">

+ <title>touch-action: pinch-zoom</title>

+ <meta name="assert" content="TA15.4 - With `touch-action: pinch-zoom` on a swiped or click/dragged element, only pinch zoom and two finger pan should be possible.">

Rick Byers 2016/09/14 15:47:51 Add a comment saying this should be upstreamed to

dtapuska 2016/09/21 19:29:38 Done.

- <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">

- <script src="/resources/testharness.js"></script>

- <script src="/resources/testharnessreport.js"></script>

- <script src="pointerevent_support.js"></script>

+ <link rel="stylesheet" type="text/css" href="../../../imported/wpt/pointerevents/pointerevent_styles.css">

+ <script src="../../../resources/testharness.js"></script>

+ <script src="../../../resources/testharnessreport.js"></script>

+ <script src="../../../imported/wpt/pointerevents/pointerevent_support.js"></script>

<style>

#target0 {

width: 700px;

height: 430px;

- touch-action: pan-up;

+ touch-action: pinch-zoom;

}

</style>

</head>

- <body onload="run()">

+ <body id="target14" onload="run()">

<h1>Pointer Events touch-action attribute support</h1>

- <h4 id="desc">Test Description: Try to scroll element DOWN (drag up), then RIGHT (drag left), then UP (drag down). Tap Complete button under the rectangle when done. Expected: only pans in up direction.</h4>

+ <h4 id="desc">Test Description: Place one finger down, pan down. Lift finger and place two fingers down and try to pinch zoom. Expected: only pinch zooms.</h4>

<p>Note: this test is for touch-devices only</p>

<p>

@@ -83,32 +83,42 @@

function run() {

var target0 = document.getElementById("target0");

var btnComplete = document.getElementById("btnComplete");

- target0.scrollTop = 200;

var scrollListenerExecuted = false;

target0.addEventListener("scroll", function(event) {

scrollListenerExecuted = true;

- assert_less_than_equal(target0.scrollTop, 200);

});

- // Check if "touch-action: pan-up" attribute works properly

+ // Check if "touch-action: pinch-zoom" attribute works properly

//TA: 15.4

on_event(btnComplete, 'click', function(event) {

detected_pointertypes[event.pointerType] = true;

test_touchaction.step(function() {

- assert_true(scrollListenerExecuted, "scroll listener should have been executed by the end of the test");

+ assert_true(scrollListenerExecuted, "scroll listener should not have been executed by the end of the test");

assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");

- assert_less_than(target0.scrollTop, 200, "scroll y offset should be less than 200 in the end of the test");

+ assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");

+ assert_greater_than(window.visualViewport.scale, 1, "scale should be greater than 1 in the end of the test");

});

test_touchaction.done();

updateDescriptionComplete();

});

}

</script>

- <h1>touch-action: pan-up</h1>

+ <h1>touch-action: pinch-zoom</h1>

<p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>

</div>

+ <script>

+ function inject_input() {

+ return touchScrollInTarget('#target0', 'down').then(function() {

+ return pinchZoomInTarget('#target0', 3.0);

+ }).then(function() {

+ return touchTapInTarget('#btnComplete');

+ });

+ }

+ </script>

+ <script src='../../../imported/wpt_automation/pointerevents/pointerevent_common_input.js'></script>

</body>

</html>