diff options
| author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-04-22 13:32:05 +0200 |
|---|---|---|
| committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-04-26 12:00:26 +0200 |
| commit | 9d52feffbbfd77a1e5432ae108e338d572e07eb8 (patch) | |
| tree | 40d0a210aa3be8ca5d2140bc83859bd8a2e5ff1c | |
| parent | e4f34fde1bbddffdf1bd6e5157f9aee416938b8d (diff) | |
| download | servo-9d52feffbbfd77a1e5432ae108e338d572e07eb8.tar.gz servo-9d52feffbbfd77a1e5432ae108e338d572e07eb8.zip | |
Rename shadow_root_from_node to containing_shadow_root
| -rw-r--r-- | components/script/dom/node.rs | 4 | ||||
| -rw-r--r-- | components/script/stylesheet_loader.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 889c22f68ca..f58f1af652b 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2827,7 +2827,7 @@ pub fn document_from_node<T: DerivedFrom<Node> + DomObject>(derived: &T) -> DomR derived.upcast().owner_doc() } -pub fn shadow_root_from_node<T: DerivedFrom<Node> + DomObject>( +pub fn containing_shadow_root<T: DerivedFrom<Node> + DomObject>( derived: &T, ) -> Option<DomRoot<ShadowRoot>> { derived.upcast().owner_shadow_root() @@ -2837,7 +2837,7 @@ pub fn shadow_root_from_node<T: DerivedFrom<Node> + DomObject>( pub fn stylesheets_owner_from_node<T: DerivedFrom<Node> + DomObject>( derived: &T, ) -> StyleSheetListOwner { - if let Some(shadow_root) = shadow_root_from_node(derived) { + if let Some(shadow_root) = containing_shadow_root(derived) { StyleSheetListOwner::ShadowRoot(Dom::from_ref(&*shadow_root)) } else { StyleSheetListOwner::Document(Dom::from_ref(&*document_from_node(derived))) diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index 3c75bfef520..69975c7803b 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -13,7 +13,7 @@ use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; use crate::dom::htmlelement::HTMLElement; use crate::dom::htmllinkelement::{HTMLLinkElement, RequestGenerationId}; -use crate::dom::node::{document_from_node, shadow_root_from_node, window_from_node}; +use crate::dom::node::{containing_shadow_root, document_from_node, window_from_node}; use crate::dom::performanceresourcetiming::InitiatorType; use crate::dom::shadowroot::ShadowRoot; use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener}; @@ -270,7 +270,7 @@ impl<'a> StylesheetLoader<'a> { integrity_metadata: String, ) { let document = document_from_node(self.elem); - let shadow_root = shadow_root_from_node(self.elem).map(|sr| Trusted::new(&*sr)); + let shadow_root = containing_shadow_root(self.elem).map(|sr| Trusted::new(&*sr)); let gen = self .elem .downcast::<HTMLLinkElement>() |