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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 switches::kDisablePullToRefreshEffect)) { | 89 switches::kDisablePullToRefreshEffect)) { |
90 return nullptr; | 90 return nullptr; |
91 } | 91 } |
92 | 92 |
93 return base::MakeUnique<OverscrollRefresh>(overscroll_refresh_handler); | 93 return base::MakeUnique<OverscrollRefresh>(overscroll_refresh_handler); |
94 } | 94 } |
95 | 95 |
96 } // namespace | 96 } // namespace |
97 | 97 |
98 OverscrollControllerAndroid::OverscrollControllerAndroid( | 98 OverscrollControllerAndroid::OverscrollControllerAndroid( |
99 ui::WindowAndroidCompositor* compositor, | |
100 float dpi_scale, | |
101 std::unique_ptr<ui::OverscrollGlow> glow_effect, | |
102 std::unique_ptr<ui::OverscrollRefresh> refresh_effect) | |
103 : compositor_(compositor), | |
104 dpi_scale_(dpi_scale), | |
105 enabled_(true), | |
106 scroll_update_consumed_(false), | |
107 glow_effect_(std::move(glow_effect)), | |
108 refresh_effect_(std::move(refresh_effect)) {} | |
109 | |
110 OverscrollControllerAndroid::OverscrollControllerAndroid( | |
99 ui::OverscrollRefreshHandler* overscroll_refresh_handler, | 111 ui::OverscrollRefreshHandler* overscroll_refresh_handler, |
100 ui::WindowAndroidCompositor* compositor, | 112 ui::WindowAndroidCompositor* compositor, |
101 float dpi_scale) | 113 float dpi_scale) |
102 : compositor_(compositor), | 114 : OverscrollControllerAndroid( |
103 dpi_scale_(dpi_scale), | 115 compositor, |
104 enabled_(true), | 116 dpi_scale, |
105 glow_effect_(CreateGlowEffect(this, dpi_scale_)), | 117 CreateGlowEffect(this, dpi_scale), |
106 refresh_effect_(CreateRefreshEffect(overscroll_refresh_handler)) { | 118 CreateRefreshEffect(overscroll_refresh_handler)) {} |
107 DCHECK(compositor_); | |
108 } | |
109 | 119 |
110 OverscrollControllerAndroid::~OverscrollControllerAndroid() { | 120 OverscrollControllerAndroid::~OverscrollControllerAndroid() { |
111 } | 121 } |
112 | 122 |
113 bool OverscrollControllerAndroid::WillHandleGestureEvent( | 123 bool OverscrollControllerAndroid::WillHandleGestureEvent( |
114 const blink::WebGestureEvent& event) { | 124 const blink::WebGestureEvent& event) { |
115 if (!enabled_) | 125 if (!enabled_) |
116 return false; | 126 return false; |
117 | 127 |
118 if (!refresh_effect_) | 128 if (!refresh_effect_) |
119 return false; | 129 return false; |
120 | 130 |
121 // Suppress refresh detection if the glow effect is still prominent. | 131 // Suppress refresh detection if the glow effect is still prominent. |
122 if (glow_effect_ && glow_effect_->IsActive()) { | 132 if (glow_effect_ && glow_effect_->IsActive()) { |
123 if (glow_effect_->GetVisibleAlpha() > MinGlowAlphaToDisableRefresh()) | 133 if (glow_effect_->GetVisibleAlpha() > MinGlowAlphaToDisableRefresh()) |
124 return false; | 134 return false; |
125 } | 135 } |
126 | 136 |
127 bool handled = false; | 137 bool handled = false; |
128 switch (event.GetType()) { | 138 switch (event.GetType()) { |
129 case blink::WebInputEvent::kGestureScrollBegin: | 139 case blink::WebInputEvent::kGestureScrollBegin: |
130 refresh_effect_->OnScrollBegin(); | 140 refresh_effect_->OnScrollBegin(); |
141 scroll_update_consumed_ = false; | |
131 break; | 142 break; |
132 | 143 |
133 case blink::WebInputEvent::kGestureScrollUpdate: { | 144 case blink::WebInputEvent::kGestureScrollUpdate: { |
134 gfx::Vector2dF scroll_delta(event.data.scroll_update.delta_x, | 145 gfx::Vector2dF scroll_delta(event.data.scroll_update.delta_x, |
135 event.data.scroll_update.delta_y); | 146 event.data.scroll_update.delta_y); |
136 scroll_delta.Scale(dpi_scale_); | 147 scroll_delta.Scale(dpi_scale_); |
137 handled = refresh_effect_->WillHandleScrollUpdate(scroll_delta); | 148 handled = refresh_effect_->WillHandleScrollUpdate(scroll_delta); |
138 } break; | 149 } break; |
139 | 150 |
140 case blink::WebInputEvent::kGestureScrollEnd: | 151 case blink::WebInputEvent::kGestureScrollEnd: |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
182 // sent from the renderer compositor. | 193 // sent from the renderer compositor. |
183 if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd || | 194 if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd || |
184 event.GetType() == blink::WebInputEvent::kGestureFlingStart) { | 195 event.GetType() == blink::WebInputEvent::kGestureFlingStart) { |
185 OnOverscrolled(DidOverscrollParams()); | 196 OnOverscrolled(DidOverscrollParams()); |
186 } | 197 } |
187 | 198 |
188 if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && | 199 if (event.GetType() == blink::WebInputEvent::kGestureScrollUpdate && |
189 refresh_effect_) { | 200 refresh_effect_) { |
190 // The effect should only be allowed if both the causal touch events go | 201 // The effect should only be allowed if both the causal touch events go |
191 // unconsumed and the generated scroll events go unconsumed. | 202 // unconsumed and the generated scroll events go unconsumed. |
192 bool consumed = | 203 scroll_update_consumed_ = |
193 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED || | 204 ack_result == INPUT_EVENT_ACK_STATE_CONSUMED || |
194 event.data.scroll_update.previous_update_in_sequence_prevented; | 205 event.data.scroll_update.previous_update_in_sequence_prevented; |
195 refresh_effect_->OnScrollUpdateAck(consumed); | |
196 } | 206 } |
197 } | 207 } |
198 | 208 |
199 void OverscrollControllerAndroid::OnOverscrolled( | 209 void OverscrollControllerAndroid::OnOverscrolled( |
200 const DidOverscrollParams& params) { | 210 const DidOverscrollParams& params) { |
201 if (!enabled_) | 211 if (!enabled_) |
202 return; | 212 return; |
203 | 213 |
204 if (refresh_effect_ && (refresh_effect_->IsActive() || | 214 if (refresh_effect_) { |
205 refresh_effect_->IsAwaitingScrollUpdateAck())) { | 215 bool can_navigate = |
206 // An active (or potentially active) refresh effect should always pre-empt | 216 (!scroll_update_consumed_) && |
aelias_OOO_until_Jul13
2017/08/11 21:50:32
nit: please remove parens since operator precedenc
sunyunjia
2017/08/18 18:44:06
Done.
| |
207 // the passive glow effect. | 217 (params.scroll_boundary_behavior.y == |
208 return; | 218 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: |
219 kScrollBoundaryBehaviorTypeAuto); | |
220 refresh_effect_->OnOverscrolled(can_navigate); | |
221 | |
222 if (refresh_effect_->IsActive() || | |
223 refresh_effect_->IsAwaitingScrollUpdateAck()) { | |
224 // An active (or potentially active) refresh effect should always pre-empt | |
225 // the passive glow effect. | |
226 return; | |
227 } | |
209 } | 228 } |
210 | 229 |
211 if (glow_effect_ && | 230 gfx::Vector2dF accumulated_overscroll = |
212 glow_effect_->OnOverscrolled( | 231 gfx::ScaleVector2d(params.accumulated_overscroll, dpi_scale_); |
213 base::TimeTicks::Now(), | 232 gfx::Vector2dF latest_overscroll_delta = |
214 gfx::ScaleVector2d(params.accumulated_overscroll, dpi_scale_), | 233 gfx::ScaleVector2d(params.latest_overscroll_delta, dpi_scale_); |
215 gfx::ScaleVector2d(params.latest_overscroll_delta, dpi_scale_), | 234 gfx::Vector2dF current_fling_velocity = |
216 gfx::ScaleVector2d(params.current_fling_velocity, dpi_scale_), | 235 gfx::ScaleVector2d(params.current_fling_velocity, dpi_scale_); |
217 gfx::ScaleVector2d( | 236 gfx::Vector2dF overscroll_location = gfx::ScaleVector2d( |
218 params.causal_event_viewport_point.OffsetFromOrigin(), | 237 params.causal_event_viewport_point.OffsetFromOrigin(), dpi_scale_); |
219 dpi_scale_))) { | 238 |
239 if (params.scroll_boundary_behavior.x == | |
240 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: | |
241 kScrollBoundaryBehaviorTypeNone) { | |
242 accumulated_overscroll.set_x(0); | |
243 latest_overscroll_delta.set_x(0); | |
244 current_fling_velocity.set_x(0); | |
245 } | |
246 | |
247 if (params.scroll_boundary_behavior.y == | |
248 cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: | |
249 kScrollBoundaryBehaviorTypeNone) { | |
250 accumulated_overscroll.set_y(0); | |
251 latest_overscroll_delta.set_y(0); | |
252 current_fling_velocity.set_y(0); | |
253 } | |
254 | |
255 if (glow_effect_ && glow_effect_->OnOverscrolled( | |
256 base::TimeTicks::Now(), accumulated_overscroll, | |
257 latest_overscroll_delta, current_fling_velocity, | |
258 overscroll_location)) { | |
220 SetNeedsAnimate(); | 259 SetNeedsAnimate(); |
221 } | 260 } |
222 } | 261 } |
223 | 262 |
224 bool OverscrollControllerAndroid::Animate(base::TimeTicks current_time, | 263 bool OverscrollControllerAndroid::Animate(base::TimeTicks current_time, |
225 cc::Layer* parent_layer) { | 264 cc::Layer* parent_layer) { |
226 DCHECK(parent_layer); | 265 DCHECK(parent_layer); |
227 if (!enabled_ || !glow_effect_) | 266 if (!enabled_ || !glow_effect_) |
228 return false; | 267 return false; |
229 | 268 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
270 glow_effect_->Reset(); | 309 glow_effect_->Reset(); |
271 } | 310 } |
272 } | 311 } |
273 | 312 |
274 std::unique_ptr<EdgeEffectBase> | 313 std::unique_ptr<EdgeEffectBase> |
275 OverscrollControllerAndroid::CreateEdgeEffect() { | 314 OverscrollControllerAndroid::CreateEdgeEffect() { |
276 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); | 315 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); |
277 } | 316 } |
278 | 317 |
279 void OverscrollControllerAndroid::SetNeedsAnimate() { | 318 void OverscrollControllerAndroid::SetNeedsAnimate() { |
280 compositor_->SetNeedsAnimate(); | 319 if (compositor_) |
320 compositor_->SetNeedsAnimate(); | |
281 } | 321 } |
282 | 322 |
283 } // namespace content | 323 } // namespace content |
OLD | NEW |