diff options
| author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-03-07 18:46:08 +0100 |
|---|---|---|
| committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-04-26 11:42:38 +0200 |
| commit | 8eba5875471c9ddef95e0e4d4207ee6d6e70bbfd (patch) | |
| tree | c38362ef9a1b32e5ac714d6bc2a6353954ac36a0 /components/script/script_thread.rs | |
| parent | 0ca4792dc622029b807b40eee47cc38dd5d24e9a (diff) | |
| download | servo-8eba5875471c9ddef95e0e4d4207ee6d6e70bbfd.tar.gz servo-8eba5875471c9ddef95e0e4d4207ee6d6e70bbfd.zip | |
Merge Node::shadow_including_inclusive_ancestors into inclusive_ancestors
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 84a4182ae3e..4fbaec2b465 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -51,7 +51,9 @@ use crate::dom::globalscope::GlobalScope; use crate::dom::htmlanchorelement::HTMLAnchorElement; use crate::dom::htmliframeelement::{HTMLIFrameElement, NavigationType}; use crate::dom::mutationobserver::MutationObserver; -use crate::dom::node::{from_untrusted_node_address, window_from_node, Node, NodeDamage}; +use crate::dom::node::{ + from_untrusted_node_address, window_from_node, Node, NodeDamage, ShadowIncluding, +}; use crate::dom::performanceentry::PerformanceEntry; use crate::dom::performancepainttiming::PerformancePaintTiming; use crate::dom::serviceworker::TrustedServiceWorkerAddress; @@ -3097,7 +3099,7 @@ impl ScriptThread { if let Some(target) = self.topmost_mouse_over_target.get() { if let Some(anchor) = target .upcast::<Node>() - .inclusive_ancestors() + .inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::<HTMLAnchorElement>) .next() { @@ -3121,7 +3123,7 @@ impl ScriptThread { if let Some(target) = prev_mouse_over_target { if let Some(_) = target .upcast::<Node>() - .inclusive_ancestors() + .inclusive_ancestors(ShadowIncluding::No) .filter_map(DomRoot::downcast::<HTMLAnchorElement>) .next() { |