Index: ui/android/overscroll_glow.h |
diff --git a/ui/android/overscroll_glow.h b/ui/android/overscroll_glow.h |
index 8253de04575409bc89361f322adc9399fa1c124f..740f89d60954908f0d80fdc0f0683ea8b254c19c 100644 |
--- a/ui/android/overscroll_glow.h |
+++ b/ui/android/overscroll_glow.h |
@@ -36,7 +36,6 @@ class UI_ANDROID_EXPORT OverscrollGlowClient { |
*/ |
class UI_ANDROID_EXPORT OverscrollGlow { |
public: |
- // |client| must be valid for the duration of the effect's lifetime. |
majidvp
2017/07/20 13:26:55
Why remove this? This is still true for normal ope
sunyunjia
2017/07/21 13:52:23
Added it back. I was thinking of the test case.
|
// The effect is enabled by default, but will remain dormant until the first |
// overscroll event. |
explicit OverscrollGlow(OverscrollGlowClient* client); |
@@ -47,11 +46,11 @@ class UI_ANDROID_EXPORT OverscrollGlow { |
// |velocity| is in device pixels / second. |
// |overscroll_location| is the coordinate of the causal overscrolling event. |
// Returns true if the effect still needs animation ticks. |
- bool OnOverscrolled(base::TimeTicks current_time, |
- const gfx::Vector2dF& accumulated_overscroll, |
- gfx::Vector2dF overscroll_delta, |
- gfx::Vector2dF velocity, |
- const gfx::Vector2dF& overscroll_location); |
+ virtual bool OnOverscrolled(base::TimeTicks current_time, |
+ const gfx::Vector2dF& accumulated_overscroll, |
+ gfx::Vector2dF overscroll_delta, |
+ gfx::Vector2dF velocity, |
+ const gfx::Vector2dF& overscroll_location); |
// Returns true if the effect still needs animation ticks, with effect layers |
// attached to |parent_layer| if necessary. |