summaryrefslogtreecommitdiffstats
path: root/ui/events/gestures
diff options
context:
space:
mode:
authortdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 22:56:09 +0000
committertdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 22:56:09 +0000
commite2c3deb64e4a7fca99f3e90bee19b83c7fcb903b (patch)
tree059f71870daaf7126f43b65a2a87b07420a4c654 /ui/events/gestures
parent1d5d8db8a1c37803286cc90a16554e673aa3d032 (diff)
downloadchromium_src-e2c3deb64e4a7fca99f3e90bee19b83c7fcb903b.zip
chromium_src-e2c3deb64e4a7fca99f3e90bee19b83c7fcb903b.tar.gz
chromium_src-e2c3deb64e4a7fca99f3e90bee19b83c7fcb903b.tar.bz2
Stop touch-absorption from creating large pinch update deltas
TEST=GestureRecognizerTest.PinchAlternatelyConsumedTest BUG=361223 Review URL: https://codereview.chromium.org/225823004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/events/gestures')
-rw-r--r--ui/events/gestures/gesture_sequence.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/events/gestures/gesture_sequence.cc b/ui/events/gestures/gesture_sequence.cc
index 2ca1579..f0513dd 100644
--- a/ui/events/gestures/gesture_sequence.cc
+++ b/ui/events/gestures/gesture_sequence.cc
@@ -708,6 +708,10 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
case GST_PINCH_THIRD_MOVED_HANDLED:
case GST_PINCH_FOURTH_MOVED_HANDLED:
case GST_PINCH_FIFTH_MOVED_HANDLED:
+ // If touches are consumed for a while, and then left unconsumed, we don't
+ // want a PinchUpdate or ScrollUpdate with a massive delta.
+ latest_multi_scroll_update_location_ = bounding_box_.CenterPoint();
+ pinch_distance_current_ = BoundingBoxDiagonal(bounding_box_);
break;
case GST_PINCH_FIRST_MOVED:
case GST_PINCH_SECOND_MOVED: