diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:32:36 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:32:36 +0000 |
| commit | 5b2671d16f1e8fc2605e6d52e946df6be37ef460 (patch) | |
| tree | f23c8cb8b777559992df69e82ae9e8167bbc0d9a | |
| parent | e332a1bd94f8cb21c64c6bda59527e48e1502840 (diff) | |
| download | chromium_src-5b2671d16f1e8fc2605e6d52e946df6be37ef460.zip chromium_src-5b2671d16f1e8fc2605e6d52e946df6be37ef460.tar.gz chromium_src-5b2671d16f1e8fc2605e6d52e946df6be37ef460.tar.bz2 | |
Revert 136373 - Plumg long press gesture event. Also fix bug in gesture sequence where point
count becomes negative.
BUG=102196
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10384057
TBR=varunjain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10381096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136378 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/web_input_event_aurax11.cc | 2 | ||||
| -rw-r--r-- | ui/base/gestures/gesture_sequence.cc | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index 8b20ea2..7eda19a 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -363,7 +363,7 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; break; case ui::ET_GESTURE_LONG_PRESS: - gesture_event.type = WebKit::WebInputEvent::GestureLongPress; + // TODO(tdresser): Integrate long press with WebKit break; default: NOTREACHED() << "Unknown gesture type: " << event->type(); diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index 4898f64..319713c 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -306,11 +306,8 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture( if (point.point_id() > old_point.point_id()) point.set_point_id(point.point_id() - 1); } - if (old_point.in_use()) { - old_point.Reset(); - --point_count_; - DCHECK_GE(point_count_, 0); - } + old_point.Reset(); + --point_count_; } return gestures.release(); |