Skip to content

Fix currently scrolling layer id caching #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 31, 2017
Merged

Fix currently scrolling layer id caching #800

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41c7e3f
set self.current_scroll_layer_id to None, if no matching layer exists…
gterzian Jan 28, 2017
4a5403c
clearer variable names
gterzian Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions webrender/src/scroll_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,20 @@ impl ScrollTree {
phase,
self.find_scrolling_layer_at_point(&cursor),
self.current_scroll_layer_id) {
(ScrollEventPhase::Start, scroll_layer_id, _) => {
self.current_scroll_layer_id = Some(scroll_layer_id);
(ScrollEventPhase::Start, scroll_layer_at_point_id, _) => {
self.current_scroll_layer_id = Some(scroll_layer_at_point_id);
scroll_layer_at_point_id
},
(_, scroll_layer_at_point_id, Some(cached_scroll_layer_id)) => {
let scroll_layer_id = match self.layers.get(&cached_scroll_layer_id) {
Some(_) => cached_scroll_layer_id,
None => {
self.current_scroll_layer_id = Some(scroll_layer_at_point_id);
scroll_layer_at_point_id
},
};
scroll_layer_id
},
(_, _, Some(scroll_layer_id)) => scroll_layer_id,
(_, _, None) => return false,
};

Expand Down