aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/bindings/root.rs14
-rwxr-xr-xcomponents/script/dom/htmlformelement.rs4
2 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index f845bd3bd30..417d4b9de52 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -400,11 +400,11 @@ impl<T: DomObject> HeapSizeOf for MutNullableDom<T> {
/// This should only be used as a field in other DOM objects; see warning
/// on `Dom<T>`.
#[must_root]
-pub struct OnceCellJS<T: DomObject> {
+pub struct DomOnceCell<T: DomObject> {
ptr: OnceCell<Dom<T>>,
}
-impl<T: DomObject> OnceCellJS<T> {
+impl<T: DomObject> DomOnceCell<T> {
/// Retrieve a copy of the current inner value. If it is `None`, it is
/// initialized with the result of `cb` first.
#[allow(unrooted_must_root)]
@@ -416,17 +416,17 @@ impl<T: DomObject> OnceCellJS<T> {
}
}
-impl<T: DomObject> Default for OnceCellJS<T> {
+impl<T: DomObject> Default for DomOnceCell<T> {
#[allow(unrooted_must_root)]
- fn default() -> OnceCellJS<T> {
+ fn default() -> DomOnceCell<T> {
debug_assert!(thread_state::get().is_script());
- OnceCellJS {
+ DomOnceCell {
ptr: OnceCell::new(),
}
}
}
-impl<T: DomObject> HeapSizeOf for OnceCellJS<T> {
+impl<T: DomObject> HeapSizeOf for DomOnceCell<T> {
fn heap_size_of_children(&self) -> usize {
// See comment on HeapSizeOf for Dom<T>.
0
@@ -434,7 +434,7 @@ impl<T: DomObject> HeapSizeOf for OnceCellJS<T> {
}
#[allow(unrooted_must_root)]
-unsafe impl<T: DomObject> JSTraceable for OnceCellJS<T> {
+unsafe impl<T: DomObject> JSTraceable for DomOnceCell<T> {
unsafe fn trace(&self, trc: *mut JSTracer) {
if let Some(ptr) = self.ptr.as_ref() {
ptr.trace(trc);
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 5f553d1d433..a062ca3f055 100755
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -15,7 +15,7 @@ use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding::HTMLTextAreaEl
use dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId};
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::DomObject;
-use dom::bindings::root::{Dom, OnceCellJS, Root, RootedReference};
+use dom::bindings::root::{Dom, DomOnceCell, Root, RootedReference};
use dom::bindings::str::DOMString;
use dom::blob::Blob;
use dom::document::Document;
@@ -64,7 +64,7 @@ pub struct GenerationId(u32);
pub struct HTMLFormElement {
htmlelement: HTMLElement,
marked_for_reset: Cell<bool>,
- elements: OnceCellJS<HTMLFormControlsCollection>,
+ elements: DomOnceCell<HTMLFormControlsCollection>,
generation_id: Cell<GenerationId>,
controls: DOMRefCell<Vec<Dom<Element>>>,
}