summaryrefslogtreecommitdiff
path: root/chromium/ui/events/gestures/gesture_recognizer_impl.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-20 10:33:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-22 11:45:12 +0000
commitbe59a35641616a4cf23c4a13fa0632624b021c1b (patch)
tree9da183258bdf9cc413f7562079d25ace6955467f /chromium/ui/events/gestures/gesture_recognizer_impl.h
parentd702e4b6a64574e97fc7df8fe3238cde70242080 (diff)
downloadqtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ui/events/gestures/gesture_recognizer_impl.h')
-rw-r--r--chromium/ui/events/gestures/gesture_recognizer_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/ui/events/gestures/gesture_recognizer_impl.h b/chromium/ui/events/gestures/gesture_recognizer_impl.h
index f06cf6dc613..52901ce251c 100644
--- a/chromium/ui/events/gestures/gesture_recognizer_impl.h
+++ b/chromium/ui/events/gestures/gesture_recognizer_impl.h
@@ -59,6 +59,10 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
virtual GestureProviderAura* GetGestureProviderForConsumer(
GestureConsumer* c);
+ // Overridden from GestureRecognizer
+ bool ProcessTouchEventPreDispatch(TouchEvent* event,
+ GestureConsumer* consumer) override;
+
private:
// Sets up the target consumer for gestures based on the touch-event.
void SetupTargets(const TouchEvent& event, GestureConsumer* consumer);
@@ -66,10 +70,6 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
void DispatchGestureEvent(GestureConsumer* raw_input_consumer,
GestureEvent* event);
- // Overridden from GestureRecognizer
- bool ProcessTouchEventPreDispatch(TouchEvent* event,
- GestureConsumer* consumer) override;
-
Gestures AckTouchEvent(uint32_t unique_event_id,
ui::EventResult result,
bool is_source_touch_event_set_non_blocking,