Index: third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-right-css_touch-manual.html |
diff --git a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html b/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-right-css_touch-manual.html |
similarity index 81% |
copy from third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html |
copy to third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-right-css_touch-manual.html |
index e757baec6be427884d6270234f4c73e3ddb959b5..53bbac65ec5b1d11c277abf9388b4f119f42fb89 100644 |
--- a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html |
+++ b/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-pan-right-css_touch-manual.html |
@@ -1,8 +1,8 @@ |
<!doctype html> |
<html> |
<head> |
- <title>touch-action: pan-x</title> |
- <meta name="assert" content="TA15.3 - With `touch-action: pan-x` on a swiped or click/dragged element, only panning on the x-axis should be possible."> |
+ <title>touch-action: pan-right</title> |
+ <meta name="assert" content="TA15.3 - With `touch-action: pan-right` on a swiped or click/dragged element, only panning on the x-axis right direction should be possible."> |
<meta name="viewport" content="width=device-width"> |
<link rel="stylesheet" type="text/css" href="pointerevent_styles.css"> |
<script src="/resources/testharness.js"></script> |
@@ -12,13 +12,13 @@ |
#target0 { |
width: 700px; |
height: 430px; |
- touch-action: pan-x; |
+ touch-action: pan-right; |
} |
</style> |
</head> |
<body onload="run()"> |
<h1>Pointer Events touch-action attribute support</h1> |
- <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: only pans in x direction.</h4> |
+ <h4 id="desc">Test Description: Try to scroll element DOWN (drag up), then LEFT (drag right), then RIGHT (drag left). Tap Complete button under the rectangle when done. Expected: only pans in right direction.</h4> |
<p>Note: this test is for touch-devices only</p> |
<div id="target0"> |
<p> |
@@ -83,13 +83,21 @@ |
function run() { |
var target0 = document.getElementById("target0"); |
var btnComplete = document.getElementById("btnComplete"); |
+ target0.scrollLeft = 200; |
- // Check if "touch-action: pan-x" attribute works properly |
+ var scrollListenerExecuted = false; |
+ target0.addEventListener("scroll", function(event) { |
+ scrollListenerExecuted = true; |
+ assert_greater_than_equal(target0.scrollLeft, 200); |
+ }); |
+ |
+ // Check if "touch-action: pan-right" attribute works properly |
//TA: 15.3 |
on_event(btnComplete, 'click', function(event) { |
detected_pointertypes[event.pointerType] = true; |
test_touchaction.step(function() { |
- assert_not_equals(target0.scrollLeft, 0, "scroll x offset should not be 0 in the end of the test"); |
+ assert_true(scrollListenerExecuted, "scroll listener should have been executed by the end of the test"); |
+ assert_greater_than(target0.scrollLeft, 200, "scroll x offset should be greater 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"); |
}); |
test_touchaction.done(); |
@@ -97,10 +105,10 @@ |
}); |
} |
</script> |
- <h1>touch-action: pan-x</h1> |
+ <h1>touch-action: pan-right</h1> |
<div id="complete-notice"> |
<p>The following pointer types were detected: <span id="pointertype-log"></span>.</p> |
</div> |
<div id="log"></div> |
</body> |
-</html> |
+</html> |