diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-29 08:38:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-29 08:38:50 -0400 |
| commit | 799490a02e9bea575bf34c39f045ef0883539f05 (patch) | |
| tree | 278cada683564db36997cf3f96c92513b89c3096 /components/script/script_thread.rs | |
| parent | d58ea974baff1b51a43d2e2bf4b287ff11991a8d (diff) | |
| parent | 37e88e77cdf00e3555599dd4004d03548bd95dcf (diff) | |
| download | servo-799490a02e9bea575bf34c39f045ef0883539f05.tar.gz servo-799490a02e9bea575bf34c39f045ef0883539f05.zip | |
Auto merge of #22743 - ferjm:shadowdom, r=emilio
Partial ShadowDOM support
This is just an early WIP, not to take it very seriously yet.
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [x] These changes fix #22719
- [x] There are tests for these changes
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22743)
<!-- Reviewable:end -->
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() { |