Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't use MutNullableHeap in InputActivationState

Browse source 
No internal mutability required here.
This commit is contained in:
Michael Wu 2015-06-26 01:36:38 -04:00
parent 58d28ca0c8
commit 0cd855379d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/htmlinputelement.rs
View file

@ -89,7 +89,7 @@ struct InputActivationState {
indeterminate: bool, indeterminate: bool,
checked: bool, checked: bool,
checked_changed: bool, checked_changed: bool,
checked_radio: MutNullableHeap<JS<HTMLInputElement>>, checked_radio: Option<JS<HTMLInputElement>>,
// In case mutability changed // In case mutability changed
was_mutable: bool, was_mutable: bool,
// In case the type changed // In case the type changed
@ -102,7 +102,7 @@ impl InputActivationState {
indeterminate: false, indeterminate: false,
checked: false, checked: false,
checked_changed: false, checked_changed: false,
checked_radio: Default::default(), checked_radio: None,
was_mutable: false, was_mutable: false,
old_type: InputType::InputText old_type: InputType::InputText
} }
@ -715,7 +715,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
r.r().Checked() r.r().Checked()
}) })
}; };
cache.checked_radio.set(checked_member.r().map(JS::from_ref)); cache.checked_radio = checked_member.r().map(JS::from_ref);
cache.checked_changed = self.checked_changed.get(); cache.checked_changed = self.checked_changed.get();
self.SetChecked(true); self.SetChecked(true);
} }
@ -751,7 +751,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
InputType::InputRadio => { InputType::InputRadio => {
// We want to restore state only if the element had been changed in the first place // We want to restore state only if the element had been changed in the first place
if cache.was_mutable { if cache.was_mutable {
let old_checked: Option<Root<HTMLInputElement>> = cache.checked_radio.get().map(|t| t.root()); let old_checked: Option<Root<HTMLInputElement>> = cache.checked_radio.map(|t| t.root());
let name = self.get_radio_group_name(); let name = self.get_radio_group_name();
match old_checked { match old_checked {
Some(ref o) => { Some(ref o) => {