From 558f5772a682c455607aa1e2f67801a904ce1154 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 7 Sep 2017 18:45:48 +0200 Subject: [PATCH] Rename VirtualMethods::attribute_is_mapped This name doesn't convey what the method is about, it's now attribute_affects_presentational_hints. --- components/script/dom/document.rs | 2 +- components/script/dom/element.rs | 4 ++-- components/script/dom/htmlfontelement.rs | 4 ++-- components/script/dom/virtualmethods.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 9201b9a12e6..886e392dee7 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -2500,7 +2500,7 @@ impl Document { entry.hint.insert(RESTYLE_STYLE_ATTRIBUTE); } - if vtable_for(el.upcast()).attribute_is_mapped(attr) { + if vtable_for(el.upcast()).attribute_affects_presentational_hints(attr) { entry.hint.insert(RESTYLE_SELF); } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 7b7af8e7af8..60a237df618 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -2303,14 +2303,14 @@ impl VirtualMethods for Element { Some(self.upcast::() as &VirtualMethods) } - fn attribute_is_mapped(&self, attr: &Attr) -> bool { + fn attribute_affects_presentational_hints(&self, attr: &Attr) -> bool { // FIXME: This should be more fine-grained, not all elements care about these. if attr.local_name() == &local_name!("width") || attr.local_name() == &local_name!("height") { return true; } - self.super_type().unwrap().attribute_is_mapped(attr) + self.super_type().unwrap().attribute_affects_presentational_hints(attr) } fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index 3cd0aceab53..b804d327326 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -71,13 +71,13 @@ impl VirtualMethods for HTMLFontElement { Some(self.upcast::() as &VirtualMethods) } - fn attribute_is_mapped(&self, attr: &Attr) -> bool { + fn attribute_affects_presentational_hints(&self, attr: &Attr) -> bool { if attr.local_name() == &local_name!("color") { return true; } // FIXME: Should also return true for `size` and `face` changes! - self.super_type().unwrap().attribute_is_mapped(attr) + self.super_type().unwrap().attribute_affects_presentational_hints(attr) } fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue { diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index c2ef31ef697..2e4376ab975 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -72,9 +72,9 @@ pub trait VirtualMethods { /// Returns `true` if given attribute `attr` affects style of the /// given element. - fn attribute_is_mapped(&self, attr: &Attr) -> bool { + fn attribute_affects_presentational_hints(&self, attr: &Attr) -> bool { match self.super_type() { - Some(s) => s.attribute_is_mapped(attr), + Some(s) => s.attribute_affects_presentational_hints(attr), None => false } }