Make offset parent queries less buggy. #14839
+364
−74
Don't crash when offset parent querying an element not in the document
- Loading branch information
Verified
This commit was signed with a verified signature.
Permutatrix
Permutator
| @@ -845,12 +845,11 @@ pub fn process_offset_parent_query<N: LayoutNode>(requested_node: N, layout_root | ||
| -> OffsetParentResponse { | ||
| let mut iterator = ParentOffsetBorderBoxIterator::new(requested_node.opaque()); | ||
| sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); | ||
| // If we didn't find the node, something went wrong. Unwrap it. | ||
| let node_offset_box = iterator.node_offset_box.unwrap(); | ||
|
|
||
| let node_offset_box = iterator.node_offset_box; | ||
| let parent_info_index = iterator.parent_nodes.iter().rposition(|info| info.is_some()); | ||
| match parent_info_index { | ||
| Some(parent_info_index) => { | ||
| match (node_offset_box, parent_info_index) { | ||
| (Some(node_offset_box), Some(parent_info_index)) => { | ||
| let parent = iterator.parent_nodes[parent_info_index].as_ref().unwrap(); | ||
| let origin = node_offset_box.offset - parent.border_box.origin; | ||
|
||
| let size = node_offset_box.rectangle.size; | ||
| @@ -859,7 +858,7 @@ pub fn process_offset_parent_query<N: LayoutNode>(requested_node: N, layout_root | ||
| rect: Rect::new(origin, size), | ||
| } | ||
| } | ||
| None => { | ||
| _ => { | ||
| OffsetParentResponse::empty() | ||
| } | ||
| } | ||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
According to https://drafts.csswg.org/cssom-view/#dom-htmlelement-offsettop
offsetTop the result of subtracting the y-coordinate of the top padding edge of the first CSS layout box associated with the offsetParent of the element from the y-coordinate of the top border edge of the first CSS layout box associated with the element,
So you may need to subtract the border of the offsetParent first?