Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: content/browser/android/overscroll_controller_android.cc

Issue 712133003: Track whether a scroll sequence has been partially prevented (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/overscroll_controller_android.cc
diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc
index db35ea49b6584653636c33e8241022b48dcd9c56..5dda6d14eb6256c87fba2650a1b61215ebe14fd3 100644
--- a/content/browser/android/overscroll_controller_android.cc
+++ b/content/browser/android/overscroll_controller_android.cc
@@ -127,9 +127,8 @@ void OverscrollControllerAndroid::OnGestureEventAck(
if (event.type == blink::WebInputEvent::GestureScrollUpdate) {
// The effect should only be allowed if both the causal touch events go
// unconsumed and the generated scroll events go unconsumed.
- // TODO(jdduke): Prevent activation if the first touchmove was consumed,
- // i.e., the first GSU was prevented.
- bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
+ bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED ||
+ event.data.scrollUpdate.previousUpdateInSequencePrevented;
refresh_effect_.OnScrollUpdateAck(consumed);
}
}
« no previous file with comments | « no previous file | content/browser/renderer_host/input/web_input_event_util.h » ('j') | ui/events/gesture_event_details.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698