third_party/WebKit/LayoutTests/fast/events/pointerevents/touch-pointer-event-properties.html - Issue 1760183002: Fixed missing pointerTypes for touch events.

Side by Side Diff: third_party/WebKit/LayoutTests/fast/events/pointerevents/touch-pointer-event-properties.html

Issue 1760183002: Fixed missing pointerTypes for touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed line-lengths, added a bug ref. Created 4 years, 9 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/events/pointerevents/mouse-pointer-event-properties.html ('k') | third_party/WebKit/LayoutTests/virtual/pointerevent/fast/events/pointerevents/mouse-pointer-event-properties-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

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

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

4 <h1>Test that pointer properties propagates from touches to PointerEvents</h1>	4 <h1>Test that pointer properties propagates from touches to PointerEvents</h1>

5 <div id="target0" style="height: 100px;"></div>	5 <div id="target0" style="height: 100px;"></div>

6 <script>	6 <script>

7 async_test(function() {	7 async_test(function() {

8 if (!window.eventSender) {	8 if (!window.eventSender) {

9 this.done();	9 this.done();

10 return;	10 return;

11 }	11 }

12 var POINTER_PROPERTIES = [	12 var POINTER_PROPERTIES = [

13 { width: 1.125, height: 1.25, pressure: .1875, tiltX: 0, tiltY: 0, pointerTy pe: "mouse", isPrimary: true },	13 { width: 1.125, height: 1.25, pressure: .1875, tiltX: 0, tiltY: 0, pointerTy pe: "mouse", isPrimary: true },

14 { width: 2.125, height: 2.25, pressure: .2500, tiltX: 25, tiltY: 26, pointer Type: "pen", isPrimary: true },	14 { width: 2.125, height: 2.25, pressure: .2500, tiltX: 25, tiltY: 26, pointer Type: "pen", isPrimary: true },

15 { width: 3.125, height: 3.25, pressure: .3125, tiltX: 0, tiltY: 0, pointerTy pe: "touch", isPrimary: true },	15 { width: 3.125, height: 3.25, pressure: .3125, tiltX: 0, tiltY: 0, pointerTy pe: "touch", isPrimary: true },

16 { width: 4.125, height: 4.25, pressure: .4375, tiltX: 0, tiltY: 0, pointerTy pe: "touch", isPrimary: false }	16 { width: 4.125, height: 4.25, pressure: .4375, tiltX: 0, tiltY: 0, pointerTy pe: "touch", isPrimary: false }

17 ];	17 ];

18 var receivedPointerEvents = [];	18 var receivedPointerEvents = [];

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

20 function checkPointerEvent(event) {	20 function checkPointerEvent(event) {

21 receivedPointerEvents.push(event);	21 receivedPointerEvents.push(event);

22 test(function() {	22 test(function() {

23 assert_between_inclusive(event.pointerId, 1, POINTER_PROPERTIES.length);	23 assert_between_inclusive(event.pointerId, 1, POINTER_PROPERTIES.length);

24 var pp = POINTER_PROPERTIES[event.pointerId-1];	24 var pp = POINTER_PROPERTIES[event.pointerId-1];

25 for ( var i in pp )	25 for (var i in pp)

26 assert_equals(event[i], pp[i], "" + i);	26 assert_equals(event[i], pp[i], "" + i);

27 }, "Pointer event properties for pointer " + event.pointerId + " on " + even t.type);	27 }, "Pointer event properties for pointer " + event.pointerId + " on " + even t.type);

28 }	28 }

29 on_event(target0, "pointerdown", this.step_func(checkPointerEvent));	29 on_event(target0, "pointerdown", this.step_func(checkPointerEvent));

30 on_event(target0, "pointermove", this.step_func(checkPointerEvent));	30 on_event(target0, "pointermove", this.step_func(checkPointerEvent));

31 on_event(target0, "pointerup", this.step_func(checkPointerEvent));	31 on_event(target0, "pointerup", this.step_func(checkPointerEvent));

32 on_event(window, "load", this.step_func_done(function() {	32 on_event(window, "load", this.step_func_done(function() {

33 assert_not_equals(window.PointerEvent, undefined, "window.PointerEvent");	33 assert_not_equals(window.PointerEvent, undefined, "window.PointerEvent");

34 var x = target0.offsetLeft + 2;	34 var x = target0.offsetLeft + 2;

35 var y = target0.offsetTop + 2;	35 var y = target0.offsetTop + 2;

36	36

37 for ( var i = 0 ; i < POINTER_PROPERTIES.length ; ++i ) {	37 for (var i = 0 ; i < POINTER_PROPERTIES.length; ++i) {

38 var pp = POINTER_PROPERTIES[i];	38 var pp = POINTER_PROPERTIES[i];

39 eventSender.addTouchPoint(x + i, y + i, pp["width"], pp["height"], pp["pre ssure"], pp["tiltX"], pp["tiltY"], pp["pointerType"]);	39 if (i != POINTER_PROPERTIES.length-1)

	40 eventSender.addTouchPoint(x + i, y + i, pp["width"], pp["height"], pp["p ressure"], pp["tiltX"], pp["tiltY"], pp["pointerType"]);

	41 else // Test default pointerType

	42 eventSender.addTouchPoint(x + i, y + i, pp["width"], pp["height"], pp["p ressure"], pp["tiltX"], pp["tiltY"]);

40 }	43 }

41 eventSender.touchStart();	44 eventSender.touchStart();

42	45

43 for ( var i = 0 ; i < POINTER_PROPERTIES.length ; ++i ) {	46 for (var i = 0 ; i < POINTER_PROPERTIES.length; ++i) {

44 var pp = POINTER_PROPERTIES[i];	47 var pp = POINTER_PROPERTIES[i];

45 eventSender.updateTouchPoint(i, x + i + 20, y + i + 20);	48 eventSender.updateTouchPoint(i, x + i + 20, y + i + 20);

46 }	49 }

47	50

48 eventSender.touchMove();	51 eventSender.touchMove();

49 for ( var i = 0 ; i < POINTER_PROPERTIES.length ; ++i )	52 for (var i = 0 ; i < POINTER_PROPERTIES.length ; ++i)

50 eventSender.releaseTouchPoint(i);	53 eventSender.releaseTouchPoint(i);

51 eventSender.touchEnd();	54 eventSender.touchEnd();

52	55

53 test(function() {	56 test(function() {

54 assert_array_equals(	57 assert_array_equals(

55 receivedPointerEvents.map(function(event) { return event.type; }),	58 receivedPointerEvents.map(function(event) { return event.type; }),

56 ["pointerdown", "pointerdown", "pointerdown", "pointerdown",	59 ["pointerdown", "pointerdown", "pointerdown", "pointerdown",

57 "pointermove", "pointermove", "pointermove", "pointermove",	60 "pointermove", "pointermove", "pointermove", "pointermove",

58 "pointerup", "pointerup", "pointerup", "pointerup"]);	61 "pointerup", "pointerup", "pointerup", "pointerup"]);

59 }, "Received pointer events");	62 }, "Received pointer events");

60 }));	63 }));

61 }, "Pointer property propagation from touches to PointerEvents");	64 }, "Pointer property propagation from touches to PointerEvents");

62 </script>	65 </script>

OLD	NEW