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

Unified Diff: Source/core/dom/Element.h

Issue 1219063013: Fix virtual/override/final usage in Source/core/dom/. (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
« no previous file with comments | « Source/core/dom/DocumentType.h ('k') | Source/core/dom/EmptyNodeList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Element.h
diff --git a/Source/core/dom/Element.h b/Source/core/dom/Element.h
index fce9b0f4517892dc8e03737d1bf5166fc5d1e390..dd3812dc57ea7c7be5e952800230c38c5bce4c57 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -90,7 +90,7 @@ class CORE_EXPORT Element : public ContainerNode {
DEFINE_WRAPPERTYPEINFO();
public:
static PassRefPtrWillBeRawPtr<Element> create(const QualifiedName&, Document*);
- virtual ~Element();
+ ~Element() override;
DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecopy);
DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecut);
@@ -206,7 +206,7 @@ public:
// Returns the absolute bounding box translated into screen coordinates:
IntRect screenRect() const;
- virtual void didMoveToNewDocument(Document&) override;
+ void didMoveToNewDocument(Document&) override;
void removeAttribute(const AtomicString& name);
void removeAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName);
@@ -239,14 +239,14 @@ public:
// A fast function for checking the local name against another atomic string.
bool hasLocalName(const AtomicString& other) const { return m_tagName.localName() == other; }
- virtual const AtomicString& localName() const override final { return m_tagName.localName(); }
+ const AtomicString& localName() const final { return m_tagName.localName(); }
AtomicString localNameForSelectorMatching() const;
const AtomicString& prefix() const { return m_tagName.prefix(); }
- virtual const AtomicString& namespaceURI() const override final { return m_tagName.namespaceURI(); }
+ const AtomicString& namespaceURI() const final { return m_tagName.namespaceURI(); }
const AtomicString& locateNamespacePrefix(const AtomicString& namespaceURI) const;
- virtual String nodeName() const override;
+ String nodeName() const override;
PassRefPtrWillBeRawPtr<Element> cloneElementWithChildren();
PassRefPtrWillBeRawPtr<Element> cloneElementWithoutChildren();
@@ -306,8 +306,8 @@ public:
virtual void copyNonAttributePropertiesFromElement(const Element&) { }
- virtual void attach(const AttachContext& = AttachContext()) override;
- virtual void detach(const AttachContext& = AttachContext()) override;
+ void attach(const AttachContext& = AttachContext()) override;
+ void detach(const AttachContext& = AttachContext()) override;
virtual LayoutObject* createLayoutObject(const ComputedStyle&);
virtual bool layoutObjectIsNeeded(const ComputedStyle&);
@@ -451,7 +451,7 @@ public:
virtual bool isOutOfRange() const { return false; }
virtual bool isClearButtonElement() const { return false; }
- virtual bool canContainRangeEndPoint() const override { return true; }
+ bool canContainRangeEndPoint() const override { return true; }
// Used for disabled form elements; if true, prevents mouse events from being dispatched
// to event listeners, and prevents DOMActivate events from being sent at all.
@@ -496,7 +496,7 @@ public:
void clearMutableInlineStyleIfEmpty();
void setTabIndex(int);
- virtual short tabIndex() const override;
+ short tabIndex() const override;
void incrementProxyCount();
void decrementProxyCount();
@@ -515,9 +515,9 @@ protected:
void addPropertyToPresentationAttributeStyle(MutableStylePropertySet*, CSSPropertyID, double value, CSSPrimitiveValue::UnitType);
void addPropertyToPresentationAttributeStyle(MutableStylePropertySet*, CSSPropertyID, const String& value);
- virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
- virtual void removedFrom(ContainerNode*) override;
- virtual void childrenChanged(const ChildrenChange&) override;
+ InsertionNotificationRequest insertedInto(ContainerNode*) override;
+ void removedFrom(ContainerNode*) override;
+ void childrenChanged(const ChildrenChange&) override;
virtual void willRecalcStyle(StyleRecalcChange);
virtual void didRecalcStyle(StyleRecalcChange);
@@ -601,8 +601,8 @@ private:
void updateId(TreeScope&, const AtomicString& oldId, const AtomicString& newId);
void updateName(const AtomicString& oldName, const AtomicString& newName);
- virtual NodeType nodeType() const override final;
- virtual bool childTypeAllowed(NodeType) const override final;
+ NodeType nodeType() const final;
+ bool childTypeAllowed(NodeType) const final;
void setAttributeInternal(size_t index, const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
void appendAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
@@ -610,14 +610,14 @@ private:
void attributeChangedFromParserOrByCloning(const QualifiedName&, const AtomicString&, AttributeModificationReason);
#ifndef NDEBUG
- virtual void formatForDebugger(char* buffer, unsigned length) const override;
+ void formatForDebugger(char* buffer, unsigned length) const override;
#endif
bool pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle, ComputedStyle* newStyle);
void cancelFocusAppearanceUpdate();
- virtual const ComputedStyle* virtualEnsureComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) override { return ensureComputedStyle(pseudoElementSpecifier); }
+ const ComputedStyle* virtualEnsureComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) override { return ensureComputedStyle(pseudoElementSpecifier); }
inline void updateCallbackSelectors(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
inline void removeCallbackSelectors();
@@ -625,7 +625,7 @@ private:
// cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
// are used instead.
- virtual PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep) override;
+ PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep) override;
virtual PassRefPtrWillBeRawPtr<Element> cloneElementWithoutAttributesAndChildren();
QualifiedName m_tagName;
« no previous file with comments | « Source/core/dom/DocumentType.h ('k') | Source/core/dom/EmptyNodeList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698