diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/ui/events/android | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/ui/events/android')
| -rw-r--r-- | chromium/ui/events/android/OWNERS | 5 | ||||
| -rw-r--r-- | chromium/ui/events/android/motion_event_android.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chromium/ui/events/android/OWNERS b/chromium/ui/events/android/OWNERS index 2328e39d3ea..2ef1a424129 100644 --- a/chromium/ui/events/android/OWNERS +++ b/chromium/ui/events/android/OWNERS @@ -1,2 +1,5 @@ aelias@chromium.org -tdresser@chromium.org
\ No newline at end of file +tdresser@chromium.org + +# TEAM: input-dev@chromium.org +# COMPONENT: Blink>Input diff --git a/chromium/ui/events/android/motion_event_android.cc b/chromium/ui/events/android/motion_event_android.cc index ee645bfc80e..8e99aa3866b 100644 --- a/chromium/ui/events/android/motion_event_android.cc +++ b/chromium/ui/events/android/motion_event_android.cc @@ -229,8 +229,8 @@ MotionEventAndroid::Action MotionEventAndroid::GetAction() const { } int MotionEventAndroid::GetActionIndex() const { - DCHECK(cached_action_ == ACTION_POINTER_UP || - cached_action_ == ACTION_POINTER_DOWN) + DCHECK(cached_action_ == MotionEvent::ACTION_POINTER_UP || + cached_action_ == MotionEvent::ACTION_POINTER_DOWN) << "Invalid action for GetActionIndex(): " << cached_action_; DCHECK_GE(cached_action_index_, 0); DCHECK_LT(cached_action_index_, static_cast<int>(cached_pointer_count_)); @@ -304,6 +304,8 @@ float MotionEventAndroid::GetPressure(size_t pointer_index) const { // accessed at most once per event instance). if (!event_.obj()) return 0.f; + if (cached_action_ == MotionEvent::ACTION_UP) + return 0.f; return Java_MotionEvent_getPressureF_I(AttachCurrentThread(), event_, pointer_index); } |