Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3972)

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2290233004: currentlyscrollinglayer cleared in scrollAnimatedBegin. (Closed)
Patch Set: nit fixed. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..92eae7cc20517277ce2a36ed3621f84933c2791d 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2788,7 +2788,6 @@ 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;
ScrollState scroll_state(scroll_state_data);
// ScrollAnimated is used for animated wheel scrolls. We find the first layer
@@ -2801,7 +2800,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;
}
@@ -2886,7 +2889,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollAnimated(
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 = false;
ScrollState scroll_state(scroll_state_data);
// ScrollAnimated is used for animated wheel scrolls. We find the first layer
@@ -2925,7 +2927,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 +4168,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();
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698