From 0cd855379d9540c7e47f11fc015e462e065a468d Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Fri, 26 Jun 2015 01:36:38 -0400
Subject: [PATCH] Don't use MutNullableHeap in InputActivationState

No internal mutability required here.
---
 components/script/dom/htmlinputelement.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 87c23d00bb91..21aaa4d82364 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -89,7 +89,7 @@ struct InputActivationState {
     indeterminate: bool,
     checked: bool,
     checked_changed: bool,
-    checked_radio: MutNullableHeap<JS<HTMLInputElement>>,
+    checked_radio: Option<JS<HTMLInputElement>>,
     // In case mutability changed
     was_mutable: bool,
     // In case the type changed
@@ -102,7 +102,7 @@ impl InputActivationState {
             indeterminate: false,
             checked: false,
             checked_changed: false,
-            checked_radio: Default::default(),
+            checked_radio: None,
             was_mutable: false,
             old_type: InputType::InputText
         }
@@ -715,7 +715,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
                                     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();
                     self.SetChecked(true);
                 }
@@ -751,7 +751,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
             InputType::InputRadio => {
                 // We want to restore state only if the element had been changed in the first place
                 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();
                     match old_checked {
                         Some(ref o) => {