diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-26 01:53:40 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-26 09:49:10 +0200 |
commit | f87c2a8d7616112ca924e30292db2d244cf87eec (patch) | |
tree | 7344afe7ec0ec1ac7d1d13f5385111ee9c4be332 /components/script/dom/htmlmediaelement.rs | |
parent | 577370746e2ce3da7fa25a20b8e1bbeed319df65 (diff) | |
download | servo-f87c2a8d7616112ca924e30292db2d244cf87eec.tar.gz servo-f87c2a8d7616112ca924e30292db2d244cf87eec.zip |
Rename Root<T> to DomRoot<T>
In a later PR, DomRoot<T> will become a type alias of Root<Dom<T>>,
where Root<T> will be able to handle all the things that need to be
rooted that have a stable traceable address that doesn't move for the
whole lifetime of the root. Stay tuned.
Diffstat (limited to 'components/script/dom/htmlmediaelement.rs')
-rw-r--r-- | components/script/dom/htmlmediaelement.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 74f8c87b77b..7d976a9d899 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -18,7 +18,7 @@ use dom::bindings::error::{Error, ErrorResult}; use dom::bindings::inheritance::Castable; use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::DomObject; -use dom::bindings::root::{MutNullableDom, Root}; +use dom::bindings::root::{DomRoot, MutNullableDom}; use dom::bindings::str::DOMString; use dom::document::Document; use dom::element::{Element, AttributeMutation}; @@ -444,7 +444,7 @@ impl HTMLMediaElement { // right here. let doc = document_from_node(self); let task = MediaElementMicrotask::ResourceSelectionTask { - elem: Root::from_ref(self), + elem: DomRoot::from_ref(self), base_url: doc.base_url() }; @@ -466,7 +466,7 @@ impl HTMLMediaElement { #[allow(dead_code)] Object, Attribute(String), - Children(Root<HTMLSourceElement>), + Children(DomRoot<HTMLSourceElement>), } fn mode(media: &HTMLMediaElement) -> Option<Mode> { if let Some(attr) = media.upcast::<Element>().get_attribute(&ns!(), &local_name!("src")) { @@ -474,7 +474,7 @@ impl HTMLMediaElement { } let source_child_element = media.upcast::<Node>() .children() - .filter_map(Root::downcast::<HTMLSourceElement>) + .filter_map(DomRoot::downcast::<HTMLSourceElement>) .next(); if let Some(element) = source_child_element { return Some(Mode::Children(element)); @@ -880,7 +880,7 @@ impl HTMLMediaElementMethods for HTMLMediaElement { } // https://html.spec.whatwg.org/multipage/#dom-media-error - fn GetError(&self) -> Option<Root<MediaError>> { + fn GetError(&self) -> Option<DomRoot<MediaError>> { self.error.get() } @@ -933,7 +933,7 @@ impl VirtualMethods for HTMLMediaElement { if context.tree_in_doc { let task = MediaElementMicrotask::PauseIfNotInDocumentTask { - elem: Root::from_ref(self) + elem: DomRoot::from_ref(self) }; ScriptThread::await_stable_state(Microtask::MediaElement(task)); } @@ -943,11 +943,11 @@ impl VirtualMethods for HTMLMediaElement { #[derive(HeapSizeOf, JSTraceable)] pub enum MediaElementMicrotask { ResourceSelectionTask { - elem: Root<HTMLMediaElement>, + elem: DomRoot<HTMLMediaElement>, base_url: ServoUrl }, PauseIfNotInDocumentTask { - elem: Root<HTMLMediaElement>, + elem: DomRoot<HTMLMediaElement>, } } |