Chromium Code Reviews| Index: cc/trees/layer_tree_host_impl.cc |
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
| index 2ec8f709dc2add212eb5f63ffc57fd2fa8bf4ee9..fb5b87e498e88d7f821b3cc0639d191829ae973b 100644 |
| --- a/cc/trees/layer_tree_host_impl.cc |
| +++ b/cc/trees/layer_tree_host_impl.cc |
| @@ -2788,7 +2788,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollAnimatedBegin( |
| ScrollStateData scroll_state_data; |
| scroll_state_data.position_x = viewport_point.x(); |
| scroll_state_data.position_y = viewport_point.y(); |
| - scroll_state_data.is_in_inertial_phase = true; |
| + scroll_state_data.is_in_inertial_phase = false; |
|
ericrk
2016/08/31 18:29:42
nit: This is already the default value of is_in_in
sahel
2016/08/31 19:16:46
Done.
|
| ScrollState scroll_state(scroll_state_data); |
| // ScrollAnimated is used for animated wheel scrolls. We find the first layer |
| @@ -2801,7 +2801,11 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollAnimatedBegin( |
| ScrollStateData scroll_state_end_data; |
| scroll_state_end_data.is_ending = true; |
| ScrollState scroll_state_end(scroll_state_end_data); |
| + // TODO(Sahel): Once the touchpad scroll latching for Non-mac devices is |
| + // implemented, the current scrolling layer should not get cleared after |
| + // each animation (crbug.com/526463). |
| ScrollEnd(&scroll_state_end); |
| + ClearCurrentlyScrollingLayer(); |
| } |
| return scroll_status; |
| } |
| @@ -2925,7 +2929,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollAnimated( |
| } |
| scroll_state.set_is_ending(true); |
| // TODO(Sahel): Once the touchpad scroll latching for Non-mac devices is |
| - // impelemented, the current scrolling layer should not get cleared after |
| + // implemented, the current scrolling layer should not get cleared after |
| // each animation (crbug.com/526463). |
| ScrollEnd(&scroll_state); |
| ClearCurrentlyScrollingLayer(); |
| @@ -4166,7 +4170,7 @@ void LayerTreeHostImpl::ScrollOffsetAnimationFinished() { |
| ScrollStateData scroll_state_data; |
| ScrollState scroll_state(scroll_state_data); |
| // TODO(Sahel): Once the touchpad scroll latching for Non-mac devices is |
| - // impelemented, the current scrolling layer should not get cleared after |
| + // implemented, the current scrolling layer should not get cleared after |
| // each animation (crbug.com/526463). |
| ScrollEnd(&scroll_state); |
| ClearCurrentlyScrollingLayer(); |