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); |
} |
} |