Index: Source/core/editing/EditingStyle.cpp |
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp |
index d2424c3d7a47b415cd47304a6208af3b8241947f..bea3a8eb73b38d53b61edc92a6badd8140d1c1f6 100644 |
--- a/Source/core/editing/EditingStyle.cpp |
+++ b/Source/core/editing/EditingStyle.cpp |
@@ -213,16 +213,16 @@ void HTMLElementEquivalent::addToStyle(Element*, EditingStyle* style) const |
style->setProperty(m_propertyID, m_primitiveValue->cssText()); |
} |
-class HTMLTextDecorationEquivalent FINAL : public HTMLElementEquivalent { |
+class HTMLTextDecorationEquivalent final : public HTMLElementEquivalent { |
public: |
static PassOwnPtrWillBeRawPtr<HTMLElementEquivalent> create(CSSValueID primitiveValue, const HTMLQualifiedName& tagName) |
{ |
return adoptPtrWillBeNoop(new HTMLTextDecorationEquivalent(primitiveValue, tagName)); |
} |
- virtual bool propertyExistsInStyle(const StylePropertySet*) const OVERRIDE; |
- virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const OVERRIDE; |
+ virtual bool propertyExistsInStyle(const StylePropertySet*) const override; |
+ virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override; |
- virtual void trace(Visitor* visitor) OVERRIDE { HTMLElementEquivalent::trace(visitor); } |
+ virtual void trace(Visitor* visitor) override { HTMLElementEquivalent::trace(visitor); } |
private: |
HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const HTMLQualifiedName& tagName); |
@@ -259,14 +259,14 @@ public: |
return adoptPtrWillBeNoop(new HTMLAttributeEquivalent(propertyID, attrName)); |
} |
- virtual bool matches(const Element* element) const OVERRIDE { return HTMLElementEquivalent::matches(element) && element->hasAttribute(m_attrName); } |
- virtual bool hasAttribute() const OVERRIDE { return true; } |
- virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const OVERRIDE; |
- virtual void addToStyle(Element*, EditingStyle*) const OVERRIDE; |
+ virtual bool matches(const Element* element) const override { return HTMLElementEquivalent::matches(element) && element->hasAttribute(m_attrName); } |
+ virtual bool hasAttribute() const override { return true; } |
+ virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override; |
+ virtual void addToStyle(Element*, EditingStyle*) const override; |
virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const; |
inline const QualifiedName& attributeName() const { return m_attrName; } |
- virtual void trace(Visitor* visitor) OVERRIDE { HTMLElementEquivalent::trace(visitor); } |
+ virtual void trace(Visitor* visitor) override { HTMLElementEquivalent::trace(visitor); } |
protected: |
HTMLAttributeEquivalent(CSSPropertyID, const HTMLQualifiedName& tagName, const QualifiedName& attrName); |
@@ -313,15 +313,15 @@ PassRefPtrWillBeRawPtr<CSSValue> HTMLAttributeEquivalent::attributeValueAsCSSVal |
return dummyStyle->getPropertyCSSValue(m_propertyID); |
} |
-class HTMLFontSizeEquivalent FINAL : public HTMLAttributeEquivalent { |
+class HTMLFontSizeEquivalent final : public HTMLAttributeEquivalent { |
public: |
static PassOwnPtrWillBeRawPtr<HTMLFontSizeEquivalent> create() |
{ |
return adoptPtrWillBeNoop(new HTMLFontSizeEquivalent()); |
} |
- virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const OVERRIDE; |
+ virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const override; |
- virtual void trace(Visitor* visitor) OVERRIDE { HTMLAttributeEquivalent::trace(visitor); } |
+ virtual void trace(Visitor* visitor) override { HTMLAttributeEquivalent::trace(visitor); } |
private: |
HTMLFontSizeEquivalent(); |