Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename shadow_root_from_node to containing_shadow_root

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-04-22 13:32:05 +02:00
parent e4f34fde1b
commit 9d52feffbb
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/node.rs
View file

@ -2827,7 +2827,7 @@ pub fn document_from_node<T: DerivedFrom<Node> + DomObject>(derived: &T) -> DomR
derived.upcast().owner_doc() 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, derived: &T,
) -> Option<DomRoot<ShadowRoot>> { ) -> Option<DomRoot<ShadowRoot>> {
derived.upcast().owner_shadow_root() 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>( pub fn stylesheets_owner_from_node<T: DerivedFrom<Node> + DomObject>(
derived: &T, derived: &T,
) -> StyleSheetListOwner { ) -> 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)) StyleSheetListOwner::ShadowRoot(Dom::from_ref(&*shadow_root))
} else { } else {
StyleSheetListOwner::Document(Dom::from_ref(&*document_from_node(derived))) StyleSheetListOwner::Document(Dom::from_ref(&*document_from_node(derived)))

4
components/script/stylesheet_loader.rs
View file

@ -13,7 +13,7 @@ use crate::dom::eventtarget::EventTarget;
use crate::dom::globalscope::GlobalScope; use crate::dom::globalscope::GlobalScope;
use crate::dom::htmlelement::HTMLElement; use crate::dom::htmlelement::HTMLElement;
use crate::dom::htmllinkelement::{HTMLLinkElement, RequestGenerationId}; 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::performanceresourcetiming::InitiatorType;
use crate::dom::shadowroot::ShadowRoot; use crate::dom::shadowroot::ShadowRoot;
use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener}; use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener};
@ -270,7 +270,7 @@ impl<'a> StylesheetLoader<'a> {
integrity_metadata: String, integrity_metadata: String,
) { ) {
let document = document_from_node(self.elem); 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 let gen = self
.elem .elem
.downcast::<HTMLLinkElement>() .downcast::<HTMLLinkElement>()