Chromium Code Reviews Chromium Code Reviews
Issue 2536563003:
Fix missing warning for canceling touchmove when in default not passive mode. (Closed)
| Index: third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html |
| diff --git a/third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html b/third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html |
| index 0691cfac4fb088d341822b1fdd92d0398172f635..7b32509f4c31ba0e650476173eefabb765baa8b8 100644 |
| --- a/third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html |
| +++ b/third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html |
| @@ -1,45 +1,74 @@ |
| -<script src="../../../resources/js-test.js"></script> |
| - |
| -<p id="description"></p> |
| -<div id="console"></div> |
| -<script type="text/javascript"> |
| -description('Test that touch events may or may not be marked cancelable. http://crbug.com/365681'); |
| - |
| -var gotTouchMove = false; |
| -var touchEvent; |
| - |
| -document.addEventListener('touchmove', function(event) { |
| - shouldBeFalse('gotTouchMove'); |
| - gotTouchMove = true; |
| - touchEvent = event; |
| - shouldBeFalse('touchEvent.defaultPrevented'); |
| - console.log('Calling preventDefault on TouchEvent with cancelable=' + event.cancelable); |
| - touchEvent.preventDefault(); |
| -}, {passive: false}); |
| - |
| -if (window.eventSender) { |
| - eventSender.addTouchPoint(152, 152); |
| - eventSender.touchStart(); |
| - |
| - eventSender.updateTouchPoint(0, 155, 155); |
| - eventSender.setTouchCancelable(true); |
| - debug('Sending cancelable touchmove'); |
| - eventSender.touchMove(); |
| - shouldBeTrue('gotTouchMove'); |
| - shouldBeTrue('touchEvent.cancelable'); |
| - shouldBeTrue('touchEvent.defaultPrevented'); |
| - gotTouchMove = false; |
| - |
| - debug(''); |
| - debug('Sending uncancelable touchmove'); |
| - eventSender.setTouchCancelable(false); |
| - eventSender.updateTouchPoint(0, 160, 160); |
| - eventSender.touchMove(); |
| - shouldBeTrue('gotTouchMove'); |
| - shouldBeFalse('touchEvent.cancelable'); |
| - shouldBeFalse('touchEvent.defaultPrevented'); |
| -} else { |
| - debug('This test requires --run-layout-test.'); |
| -} |
| +<!DOCTYPE html> |
| +<script src='../../../resources/testharness.js'></script> |
| +<script src='../../../resources/testharnessreport.js'></script> |
| + |
| +<style> |
| + #first {width: 100px; height: 50px; } |
| +</style> |
| + |
| +<body> |
| + <div id=first /> |
| + |
| +<script> |
| +test(function() { |
| + var gotTouchMove = false; |
| + var touchEvent; |
| + var handler = function(event) { |
| + assert_false(gotTouchMove); |
| + gotTouchMove = true; |
| + touchEvent = event; |
| + assert_false(touchEvent.defaultPrevented); |
| + console.log('Calling preventDefault on TouchEvent with cancelable=' + event.cancelable); |
| + touchEvent.preventDefault(); |
| + }; |
| + |
| + document.addEventListener('touchmove', handler, {passive: false}); |
| + |
| + eventSender.addTouchPoint(152, 152); |
| + eventSender.touchStart(); |
| + |
| + eventSender.updateTouchPoint(0, 155, 155); |
| + eventSender.setTouchCancelable(true); |
| + console.log('Sending cancelable touchmove'); |
| + eventSender.touchMove(); |
| + assert_true(gotTouchMove, "Got touch move"); |
| + assert_true(touchEvent.cancelable, "Event was cancelable"); |
| + assert_true(touchEvent.defaultPrevented, "Event was prevented"); |
| + gotTouchMove = false; |
| + |
| + console.log('Sending uncancelable touchmove'); |
| + eventSender.setTouchCancelable(false); |
| + eventSender.updateTouchPoint(0, 160, 160); |
| + eventSender.touchMove(); |
| + assert_true(gotTouchMove, "Got touch move"); |
| + assert_false(touchEvent.cancelable, "Event was not cancelable"); |
| + assert_false(touchEvent.defaultPrevented, "Event was not prevented"); |
| + document.removeEventListener('touchmove', handler); |
| + eventSender.clearTouchPoints(); |
| + |
| +}, 'Test that touch events may or may not be marked cancelable. http://crbug.com/365681'); |
| + |
| +test(function() { |
| + var gotTouchMove = false; |
| + var touchEvent; |
| + var handler = function(event) { |
| + gotTouchMove = true; |
| + touchEvent = event; |
| + console.log('touch mnove'); |
| + event.preventDefault(); |
| + }; |
| + eventSender.addTouchPoint(15, 15); |
| + eventSender.touchStart(); |
| + document.getElementById('first').addEventListener('touchmove', handler); |
| + eventSender.setTouchCancelable(false); |
| + eventSender.updateTouchPoint(0, 30, 30); |
| + console.log('Sending cancelable touchmove'); |
|
Rick Byers
2016/11/28 18:42:35
nit: fix log message (I was confused by the output
|
| + eventSender.touchMove(); |
| + assert_true(gotTouchMove, "Got touch move"); |
| + assert_false(touchEvent.cancelable, "Event was not cancelable"); |
| + assert_false(touchEvent.defaultPrevented, "Event was not prevented"); |
| + |
| +}, 'Test that warning occurs in default mode'); |
| </script> |
| +</body> |
