Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(727)

Unified Diff: Source/core/editing/EditingStyle.cpp

Issue 1218293014: Fix virtual/override/final usage in Source/core/editing/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/EditingStyle.cpp
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
index 42b94139365b177e908a094d55b27b0c85663ac2..a24bfff08932c9e5afe6f9c6ca8ba934f37ee6ba 100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -219,8 +219,8 @@ public:
{
return adoptPtrWillBeNoop(new HTMLTextDecorationEquivalent(primitiveValue, tagName));
}
- virtual bool propertyExistsInStyle(const StylePropertySet*) const override;
- virtual bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override;
+ bool propertyExistsInStyle(const StylePropertySet*) const override;
+ bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override;
DEFINE_INLINE_VIRTUAL_TRACE() { HTMLElementEquivalent::trace(visitor); }
@@ -259,10 +259,10 @@ 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;
+ bool matches(const Element* element) const override { return HTMLElementEquivalent::matches(element) && element->hasAttribute(m_attrName); }
+ bool hasAttribute() const override { return true; }
+ bool valueIsPresentInStyle(HTMLElement*, StylePropertySet*) const override;
+ void addToStyle(Element*, EditingStyle*) const override;
virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
inline const QualifiedName& attributeName() const { return m_attrName; }
@@ -319,7 +319,7 @@ public:
{
return adoptPtrWillBeNoop(new HTMLFontSizeEquivalent());
}
- virtual PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const override;
+ PassRefPtrWillBeRawPtr<CSSValue> attributeValueAsCSSValue(Element*) const override;
DEFINE_INLINE_VIRTUAL_TRACE() { HTMLAttributeEquivalent::trace(visitor); }

Powered by Google App Engine
This is Rietveld 408576698