OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/android/overscroll_controller_android.h" | 5 #include "content/browser/android/overscroll_controller_android.h" |
6 | 6 |
7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 // Suppress refresh detection if the glow effect is still prominent. | 121 // Suppress refresh detection if the glow effect is still prominent. |
122 if (glow_effect_ && glow_effect_->IsActive()) { | 122 if (glow_effect_ && glow_effect_->IsActive()) { |
123 if (glow_effect_->GetVisibleAlpha() > MinGlowAlphaToDisableRefresh()) | 123 if (glow_effect_->GetVisibleAlpha() > MinGlowAlphaToDisableRefresh()) |
124 return false; | 124 return false; |
125 } | 125 } |
126 | 126 |
127 bool handled = false; | 127 bool handled = false; |
128 switch (event.GetType()) { | 128 switch (event.GetType()) { |
129 case blink::WebInputEvent::kGestureScrollBegin: | 129 case blink::WebInputEvent::kGestureScrollBegin: |
130 refresh_effect_->OnScrollBegin(); | 130 refresh_effect_->OnScrollBegin(); |
| 131 scroll_update_consumed_ = false; |
131 break; | 132 break; |
132 | 133 |
133 case blink::WebInputEvent::kGestureScrollUpdate: { | 134 case blink::WebInputEvent::kGestureScrollUpdate: { |
134 gfx::Vector2dF scroll_delta(event.data.scroll_update.delta_x, | 135 gfx::Vector2dF scroll_delta(event.data.scroll_update.delta_x, |
135 event.data.scroll_update.delta_y); | 136 event.data.scroll_update.delta_y); |
136 scroll_delta.Scale(dpi_scale_); | 137 scroll_delta.Scale(dpi_scale_); |
137 handled = refresh_effect_->WillHandleScrollUpdate(scroll_delta); | 138 handled = refresh_effect_->WillHandleScrollUpdate(scroll_delta); |
138 } break; | 139 } break; |
139 | 140 |
140 case blink::WebInputEvent::kGestureScrollEnd: | 141 case blink::WebInputEvent::kGestureScrollEnd: |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 // sent from the renderer compositor. | 183 // sent from the renderer compositor. |
183 if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd || | 184 if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd || |
184 event.GetType() == blink::WebInputEvent::kGestureFlingStart) { | 185 event.GetType() == blink::WebInputEvent::kGestureFlingStart) { |
185 OnOverscrolled(DidOverscrollParams()); | 186 OnOverscrolled(DidOverscrollParams()); |
186 } | 187 } |
187 | 188 |
188 if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && | 189 if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && |
189 refresh_effect_) { | 190 refresh_effect_) { |
190 // The effect should only be allowed if both the causal touch events go | 191 // The effect should only be allowed if both the causal touch events go |
191 // unconsumed and the generated scroll events go unconsumed. | 192 // unconsumed and the generated scroll events go unconsumed. |
192 bool consumed = | 193 scroll_update_consumed_ = |
193 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED || | 194 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED || |
194 event.data.scroll_update.previous_update_in_sequence_prevented; | 195 event.data.scroll_update.previous_update_in_sequence_prevented; |
195 refresh_effect_->OnScrollUpdateAck(consumed); | |
196 } | 196 } |
197 } | 197 } |
198 | 198 |
199 void OverscrollControllerAndroid::OnOverscrolled( | 199 void OverscrollControllerAndroid::OnOverscrolled( |
200 const DidOverscrollParams& params) { | 200 const DidOverscrollParams& overscroll_params) { |
201 if (!enabled_) | 201 if (!enabled_) |
202 return; | 202 return; |
203 | 203 |
204 if (refresh_effect_ && (refresh_effect_->IsActive() || | 204 DidOverscrollParams params = overscroll_params; |
205 refresh_effect_->IsAwaitingScrollUpdateAck())) { | 205 |
206 // An active (or potentially active) refresh effect should always pre-empt | 206 if (refresh_effect_) { |
207 // the passive glow effect. | 207 bool can_navigate = |
208 return; | 208 (!scroll_update_consumed_) && |
| 209 (params.scroll_boundary_behavior.y != |
| 210 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: |
| 211 kScrollBoundaryBehaviorTypeAuto); |
| 212 refresh_effect_->OnOverscrolled(can_navigate); |
| 213 |
| 214 if (refresh_effect_->IsActive() || |
| 215 refresh_effect_->IsAwaitingScrollUpdateAck()) { |
| 216 // An active (or potentially active) refresh effect should always pre-empt |
| 217 // the passive glow effect. |
| 218 return; |
| 219 } |
| 220 } |
| 221 |
| 222 if (params.scroll_boundary_behavior.x == |
| 223 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: |
| 224 kScrollBoundaryBehaviorTypeNone) { |
| 225 params.accumulated_overscroll.set_x(0); |
| 226 params.latest_overscroll_delta.set_x(0); |
| 227 params.current_fling_velocity.set_x(0); |
| 228 } |
| 229 |
| 230 if (params.scroll_boundary_behavior.y == |
| 231 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: |
| 232 kScrollBoundaryBehaviorTypeNone) { |
| 233 params.accumulated_overscroll.set_y(0); |
| 234 params.latest_overscroll_delta.set_y(0); |
| 235 params.current_fling_velocity.set_y(0); |
209 } | 236 } |
210 | 237 |
211 if (glow_effect_ && | 238 if (glow_effect_ && |
212 glow_effect_->OnOverscrolled( | 239 glow_effect_->OnOverscrolled( |
213 base::TimeTicks::Now(), | 240 base::TimeTicks::Now(), |
214 gfx::ScaleVector2d(params.accumulated_overscroll, dpi_scale_), | 241 gfx::ScaleVector2d(params.accumulated_overscroll, dpi_scale_), |
215 gfx::ScaleVector2d(params.latest_overscroll_delta, dpi_scale_), | 242 gfx::ScaleVector2d(params.latest_overscroll_delta, dpi_scale_), |
216 gfx::ScaleVector2d(params.current_fling_velocity, dpi_scale_), | 243 gfx::ScaleVector2d(params.current_fling_velocity, dpi_scale_), |
217 gfx::ScaleVector2d( | 244 gfx::ScaleVector2d( |
218 params.causal_event_viewport_point.OffsetFromOrigin(), | 245 params.causal_event_viewport_point.OffsetFromOrigin(), |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 std::unique_ptr<EdgeEffectBase> | 301 std::unique_ptr<EdgeEffectBase> |
275 OverscrollControllerAndroid::CreateEdgeEffect() { | 302 OverscrollControllerAndroid::CreateEdgeEffect() { |
276 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); | 303 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); |
277 } | 304 } |
278 | 305 |
279 void OverscrollControllerAndroid::SetNeedsAnimate() { | 306 void OverscrollControllerAndroid::SetNeedsAnimate() { |
280 compositor_->SetNeedsAnimate(); | 307 compositor_->SetNeedsAnimate(); |
281 } | 308 } |
282 | 309 |
283 } // namespace content | 310 } // namespace content |
OLD | NEW |