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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2714043002: Store non-fast scrollable regions on ScrollNode (Closed)
Patch Set: Rebase from space Created 3 years, 10 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 | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/property_tree_builder.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 ad42f70a0651e1fa7f0fc53c8c63c98a50005a2e..29d49e242eb6ed2ceef34568cac86ac8b5178cd3 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2503,7 +2503,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::TryScroll(
return scroll_status;
}
- if (scroll_node->contains_non_fast_scrollable_region) {
+ if (!scroll_node->non_fast_scrollable_region.IsEmpty()) {
bool clipped = false;
gfx::Transform inverse_screen_space_transform(
gfx::Transform::kSkipInitialization);
@@ -2515,11 +2515,8 @@ InputHandler::ScrollStatus LayerTreeHostImpl::TryScroll(
gfx::PointF hit_test_point_in_layer_space = MathUtil::ProjectPoint(
inverse_screen_space_transform, screen_space_point, &clipped);
- if (!clipped &&
- active_tree()
- ->LayerById(scroll_node->owning_layer_id)
- ->non_fast_scrollable_region()
- .Contains(gfx::ToRoundedPoint(hit_test_point_in_layer_space))) {
+ if (!clipped && scroll_node->non_fast_scrollable_region.Contains(
+ gfx::ToRoundedPoint(hit_test_point_in_layer_space))) {
TRACE_EVENT0("cc",
"LayerImpl::tryScroll: Failed NonFastScrollableRegion");
scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD;
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698