Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not panic on navigating across documents

Browse source
This commit is contained in:
Utsav Oza 2020-07-30 16:31:36 +05:30
parent da45522085
commit 962e620529
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/document.rs
View file

@ -560,7 +560,8 @@ impl Document {
let new_dirty_root = element
.upcast::<Node>()
.common_ancestor(dirty_root.upcast(), ShadowIncluding::Yes);
.common_ancestor(dirty_root.upcast(), ShadowIncluding::Yes)
.expect("Couldn't find common ancestor");
let mut has_dirty_descendants = true;
for ancestor in dirty_root
@ -1515,10 +1516,12 @@ impl Document {
FireMouseEventType::Enter | FireMouseEventType::Leave
));
let common_ancestor = related_target.as_ref().map_or_else(
|| DomRoot::from_ref(&*event_target),
|related_target| event_target.common_ancestor(related_target, ShadowIncluding::No),
);
let common_ancestor = match related_target.as_ref() {
Some(related_target) => event_target
.common_ancestor(related_target, ShadowIncluding::No)
.unwrap_or_else(|| DomRoot::from_ref(&*event_target)),
None => DomRoot::from_ref(&*event_target),
};
// We need to create a target chain in case the event target shares
// its boundaries with its ancestors.