Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't use rposition() and unwrap() to find parent info

Browse source
This commit is contained in:
Permutator 2017-01-06 17:41:34 -08:00
parent 5ef7a0a4d8
commit 686d2f8509
No known key found for this signature in database
GPG key ID: 62D7A8D792C3B058
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/query.rs
View file

@ -861,14 +861,13 @@ pub fn process_offset_parent_query<N: LayoutNode>(requested_node: N, layout_root
sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator);
let node_offset_box = iterator.node_offset_box; let node_offset_box = iterator.node_offset_box;
let parent_info_index = iterator.parent_nodes.iter().rposition(|info| info.is_some()); let parent_info = iterator.parent_nodes.into_iter().rev().filter_map(|info| info).next();
match (node_offset_box, parent_info_index) { match (node_offset_box, parent_info) {
(Some(node_offset_box), Some(parent_info_index)) => { (Some(node_offset_box), Some(parent_info)) => {
let parent = iterator.parent_nodes[parent_info_index].as_ref().unwrap(); let origin = node_offset_box.offset - parent_info.origin;
let origin = node_offset_box.offset - parent.origin;
let size = node_offset_box.rectangle.size; let size = node_offset_box.rectangle.size;
OffsetParentResponse { OffsetParentResponse {
node_address: Some(parent.node_address.to_untrusted_node_address()), node_address: Some(parent_info.node_address.to_untrusted_node_address()),
rect: Rect::new(origin, size), rect: Rect::new(origin, size),
} }
} }