diff options
author | bors-servo <metajack+bors@gmail.com> | 2014-09-26 20:24:33 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2014-09-26 20:24:33 -0600 |
commit | a35212410ae78a19db99d284d63a00d1a72dbd79 (patch) | |
tree | 8391e92255e63f2f45613aa1a77faeb6b43e9f8d /components/script/dom/node.rs | |
parent | 86eec63a02161de84f2404ff2292d3a8d1273784 (diff) | |
parent | 4bf2a88ae2957e3c1994472f901ed5f42eb8edfe (diff) | |
download | servo-a35212410ae78a19db99d284d63a00d1a72dbd79.tar.gz servo-a35212410ae78a19db99d284d63a00d1a72dbd79.zip |
Merge pull request #3496 from zwarich/disabled-state-helpers-jsref
Convert &JSRef -> JSRef in DisabledStateHelpers
Reviewed-by: jdm
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 06c88c00dd1..b9436a0d12e 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2091,17 +2091,17 @@ impl<'a> style::TNode<JSRef<'a, Element>> for JSRef<'a, Node> { } pub trait DisabledStateHelpers { - fn check_ancestors_disabled_state_for_form_control(&self); - fn check_parent_disabled_state_for_option(&self); - fn check_disabled_attribute(&self); + fn check_ancestors_disabled_state_for_form_control(self); + fn check_parent_disabled_state_for_option(self); + fn check_disabled_attribute(self); } impl<'a> DisabledStateHelpers for JSRef<'a, Node> { - fn check_ancestors_disabled_state_for_form_control(&self) { + fn check_ancestors_disabled_state_for_form_control(self) { if self.get_disabled_state() { return; } for ancestor in self.ancestors().filter(|ancestor| ancestor.is_htmlfieldsetelement()) { if !ancestor.get_disabled_state() { continue; } - if ancestor.is_parent_of(*self) { + if ancestor.is_parent_of(self) { self.set_disabled_state(true); self.set_enabled_state(false); return; @@ -2119,7 +2119,7 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> { } } - fn check_parent_disabled_state_for_option(&self) { + fn check_parent_disabled_state_for_option(self) { if self.get_disabled_state() { return; } match self.parent_node().root() { Some(ref parent) if parent.is_htmloptgroupelement() && parent.get_disabled_state() => { @@ -2130,8 +2130,8 @@ impl<'a> DisabledStateHelpers for JSRef<'a, Node> { } } - fn check_disabled_attribute(&self) { - let elem: JSRef<'a, Element> = ElementCast::to_ref(*self).unwrap(); + fn check_disabled_attribute(self) { + let elem: JSRef<'a, Element> = ElementCast::to_ref(self).unwrap(); let has_disabled_attrib = elem.has_attribute("disabled"); self.set_disabled_state(has_disabled_attrib); self.set_enabled_state(!has_disabled_attrib); |