diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 43cf6bce3ce..0922902778a 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -13,7 +13,7 @@ use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding::HTMLTextAreaEl
use dom::bindings::conversions::DerivedFrom;
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId};
-use dom::bindings::js::{Root};
+use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::reflector::Reflectable;
use dom::document::Document;
use dom::element::Element;
@@ -47,6 +47,7 @@ use util::str::DOMString;
pub struct HTMLFormElement {
htmlelement: HTMLElement,
marked_for_reset: Cell,
+ elements: MutNullableHeap>,
}
impl HTMLFormElement {
@@ -56,6 +57,7 @@ impl HTMLFormElement {
HTMLFormElement {
htmlelement: HTMLElement::new_inherited(localName, prefix, document),
marked_for_reset: Cell::new(false),
+ elements: Default::default(),
}
}
@@ -142,6 +144,10 @@ impl HTMLFormElementMethods for HTMLFormElement {
// https://html.spec.whatwg.org/multipage/#dom-form-elements
fn Elements(&self) -> Root {
+ if let Some(elements) = self.elements.get() {
+ return elements;
+ }
+
#[derive(JSTraceable, HeapSizeOf)]
struct ElementsFilter {
form: Root
@@ -193,7 +199,9 @@ impl HTMLFormElementMethods for HTMLFormElement {
}
let filter = box ElementsFilter { form: Root::from_ref(self) };
let window = window_from_node(self);
- HTMLFormControlsCollection::new(window.r(), self.upcast(), filter)
+ let elements = HTMLFormControlsCollection::new(window.r(), self.upcast(), filter);
+ self.elements.set(Some(&elements));
+ elements
}
// https://html.spec.whatwg.org/multipage/#dom-form-length
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 7f97d1bba5f..56ecc3be95b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -35209,6 +35209,12 @@
"path": "html/semantics/forms/the-button-element/button-activate.html",
"url": "/html/semantics/forms/the-button-element/button-activate.html"
}
+ ],
+ "html/semantics/forms/the-form-element/form-elements-sameobject.html": [
+ {
+ "path": "html/semantics/forms/the-form-element/form-elements-sameobject.html",
+ "url": "/html/semantics/forms/the-form-element/form-elements-sameobject.html"
+ }
]
}
},
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-sameobject.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-sameobject.html
new file mode 100644
index 00000000000..d1ebac07f0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-sameobject.html
@@ -0,0 +1,20 @@
+
+
+Testing [SameObject] on the 'elements' attribute on the 'form' element
+
+
+
+
+
+
+