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

NamedGetter completed and fixed issues

Browse source
This commit is contained in:
Anshul Jethvani 2019-12-05 19:50:10 -05:00
parent 50fdae7a8c
commit 7b968a3ca8
1 changed files with 15 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/script/dom/htmlformelement.rs
View file

@ -80,7 +80,7 @@ pub struct HTMLFormElement {
elements: DomOnceCell<HTMLFormControlsCollection>, elements: DomOnceCell<HTMLFormControlsCollection>,
generation_id: Cell<GenerationId>, generation_id: Cell<GenerationId>,
controls: DomRefCell<Vec<Dom<Element>>>, controls: DomRefCell<Vec<Dom<Element>>>,
past_names_map: DomRefCell<HashMap<DOMString, Dom<HTMLElement>>>, past_names_map: DomRefCell<HashMap<DOMString, Dom<Element>>>,
} }
impl HTMLFormElement { impl HTMLFormElement {
@ -262,13 +262,9 @@ impl HTMLFormElementMethods for HTMLFormElement {
// https://html.spec.whatwg.org/multipage/#the-form-element%3Adetermine-the-value-of-a-named-property // https://html.spec.whatwg.org/multipage/#the-form-element%3Adetermine-the-value-of-a-named-property
fn NamedGetter(&self, name: DOMString) -> Option<RadioNodeListOrElement> { fn NamedGetter(&self, name: DOMString) -> Option<RadioNodeListOrElement> {
// unimplemented!();
let window = window_from_node(self); let window = window_from_node(self);
// Q2. ERROR in the following declaration - check the attached screenshot (image2) let mut candidates: Vec<DomRoot<Node>> = Vec::new();
let mut candidates: Vec<Dom<HTMLElement>> = Vec::new();
// let mut candidates: RadioNodeList = RadioNodeList::new(&window, Dom<HTMLElement>);
let controls = self.controls.borrow(); let controls = self.controls.borrow();
@ -281,8 +277,7 @@ impl HTMLFormElementMethods for HTMLFormElement {
(child.has_attribute(&local_name!("name")) && (child.has_attribute(&local_name!("name")) &&
child.get_string_attribute(&local_name!("name")) == name) child.get_string_attribute(&local_name!("name")) == name)
{ {
// println!("{:?}", child.what_is_this()); candidates.push(DomRoot::from_ref(&*child.upcast::<Node>()));
candidates.push(Dom::from_ref(&*child.downcast::<HTMLElement>().unwrap()));
} }
} }
} }
@ -294,7 +289,7 @@ impl HTMLFormElementMethods for HTMLFormElement {
(child.has_attribute(&local_name!("name")) && (child.has_attribute(&local_name!("name")) &&
child.get_string_attribute(&local_name!("name")) == name) child.get_string_attribute(&local_name!("name")) == name)
{ {
candidates.push(Dom::from_ref(&*child.downcast::<HTMLElement>().unwrap())); candidates.push(DomRoot::from_ref(&*child.upcast::<Node>()));
} }
} }
} }
@ -303,41 +298,28 @@ impl HTMLFormElementMethods for HTMLFormElement {
let mut past_names_map = self.past_names_map.borrow_mut(); let mut past_names_map = self.past_names_map.borrow_mut();
if candidates.len() == 0 { if candidates.len() == 0 {
for (key, val) in past_names_map.iter() { if past_names_map.contains_key(&name) {
if *key == name { return Some(RadioNodeListOrElement::Element(DomRoot::from_ref(
// println!("{:?}", val.what_is_this()); &*past_names_map.get(&name).unwrap(),
return Some(RadioNodeListOrElement::Element(DomRoot::from_ref( )));
&*val.upcast::<Element>(),
)));
}
} }
return None;
} }
if candidates.len() > 1 { if candidates.len() > 1 {
let mut candidatesDomRoot: Vec<DomRoot<Node>> = Vec::new();
for cand in candidates.iter() {
// println!("{:?}", cand.what_is_this());
candidatesDomRoot.push(DomRoot::from_ref(&*cand.upcast::<Node>()));
}
// Q1. ERROR in the following line - check the attached screenshot (image1)
// Related link for potential fix: https://stackoverflow.com/a/26953620/11978763
// we are unsure of how to incorporate this
return Some(RadioNodeListOrElement::RadioNodeList( return Some(RadioNodeListOrElement::RadioNodeList(
RadioNodeList::new_simple_list(&window, candidatesDomRoot.iter()), RadioNodeList::new_simple_list(&window, candidates.into_iter()),
)); ));
} }
let element_node = &candidates[0]; let element_node = &candidates[0];
if past_names_map.contains_key(&name) { past_names_map.insert(
let stat = past_names_map.entry(name).or_insert(element_node.clone()); name,
*stat = element_node.clone(); Dom::from_ref(&*element_node.downcast::<Element>().unwrap()),
} else { );
past_names_map.insert(name, element_node.clone());
}
return Some(RadioNodeListOrElement::Element(DomRoot::from_ref( return Some(RadioNodeListOrElement::Element(DomRoot::from_ref(
&*element_node.upcast::<Element>(), &*element_node.downcast::<Element>().unwrap(),
))); )));
} }