Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable.html

Issue 2536563003: Fix missing warning for canceling touchmove when in default not passive mode. (Closed)
Patch Set: Fix test Created 4 years, 1 month 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..effcdda486d62a0e3ef40150cdf854b9863dba4f 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,73 @@
-<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;
+ 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 uncancelable touchmove');
+ 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>
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/events/touch/touch-event-cancelable-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698