| Index: chrome/test/data/pdf/gesture_detector_test.js
|
| diff --git a/chrome/test/data/pdf/gesture_detector_test.js b/chrome/test/data/pdf/gesture_detector_test.js
|
| index b238294f46104158a05031333ba6336b12edb937..c038e28f09fab2afe977a4995df1c1a213028554 100644
|
| --- a/chrome/test/data/pdf/gesture_detector_test.js
|
| +++ b/chrome/test/data/pdf/gesture_detector_test.js
|
| @@ -182,24 +182,34 @@ chrome.test.runTests(function() {
|
| let gestureDetector = new GestureDetector(stubElement);
|
| let pinchListener = new PinchListener(gestureDetector);
|
|
|
| - // Ensure that the touchstart listener is not passive, otherwise the
|
| + // Ensure that the touchmove listener is not passive, otherwise the
|
| // call to preventDefault will be ignored. Since listeners could default
|
| // to being passive, we must set the value explicitly
|
| // (see crbug.com/675730).
|
| - for (let l of stubElement.listeners.get('touchstart')) {
|
| + for (let l of stubElement.listeners.get('touchmove')) {
|
| let options = stubElement.listenerOptions.get(l);
|
| chrome.test.assertTrue(!!options &&
|
| typeof(options.passive) == 'boolean');
|
| chrome.test.assertFalse(options.passive);
|
| }
|
|
|
| + // We should not preventDefault the touchstart for 2 fingers, since this
|
| + // could just be a 2 finger tap.
|
| let pinchStartEvent = new MockTouchEvent('touchstart', [
|
| {clientX: 0, clientY: 0},
|
| {clientX: 0, clientY: 2}
|
| ]);
|
| stubElement.sendEvent(pinchStartEvent);
|
| chrome.test.assertEq('pinchstart', pinchListener.lastEvent.type);
|
| - chrome.test.assertTrue(pinchStartEvent.defaultPrevented);
|
| + chrome.test.assertFalse(pinchStartEvent.defaultPrevented);
|
| +
|
| + let pinchUpdateEvent = new MockTouchEvent('touchmove', [
|
| + {clientX: 0, clientY: 0},
|
| + {clientX: 0, clientY: 4}
|
| + ]);
|
| + stubElement.sendEvent(pinchUpdateEvent);
|
| + chrome.test.assertEq('pinchupdate', pinchListener.lastEvent.type);
|
| + chrome.test.assertTrue(pinchUpdateEvent.defaultPrevented);
|
|
|
| chrome.test.succeed();
|
| }
|
|
|