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

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

Issue 633573004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/dom (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/ElementData.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 461a29ae20a503629183fcd684accf22636146eb..0b65f3f9a7bfa70bce1305ed37f6caddb9cdb04d 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -195,7 +195,7 @@ public:
// Returns the absolute bounding box translated into screen coordinates:
IntRect screenRect() const;
- virtual void didMoveToNewDocument(Document&) OVERRIDE;
+ virtual void didMoveToNewDocument(Document&) override;
void removeAttribute(const AtomicString& name);
void removeAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName);
@@ -228,15 +228,15 @@ 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(); }
+ virtual const AtomicString& localName() const override final { return m_tagName.localName(); }
const AtomicString& prefix() const { return m_tagName.prefix(); }
- virtual const AtomicString& namespaceURI() const OVERRIDE FINAL { return m_tagName.namespaceURI(); }
+ virtual const AtomicString& namespaceURI() const override final { return m_tagName.namespaceURI(); }
const AtomicString& locateNamespacePrefix(const AtomicString& namespaceURI) const;
- virtual KURL baseURI() const OVERRIDE FINAL;
+ virtual KURL baseURI() const override final;
- virtual String nodeName() const OVERRIDE;
+ virtual String nodeName() const override;
PassRefPtrWillBeRawPtr<Element> cloneElementWithChildren();
PassRefPtrWillBeRawPtr<Element> cloneElementWithoutChildren();
@@ -298,8 +298,8 @@ public:
virtual void copyNonAttributePropertiesFromElement(const Element&) { }
- virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
- virtual void detach(const AttachContext& = AttachContext()) OVERRIDE;
+ virtual void attach(const AttachContext& = AttachContext()) override;
+ virtual void detach(const AttachContext& = AttachContext()) override;
virtual RenderObject* createRenderer(RenderStyle*);
virtual bool rendererIsNeeded(const RenderStyle&);
void recalcStyle(StyleRecalcChange, Text* nextTextSibling = 0);
@@ -434,7 +434,7 @@ public:
virtual bool isOutOfRange() const { return false; }
virtual bool isClearButtonElement() const { return false; }
- virtual bool canContainRangeEndPoint() const OVERRIDE { return true; }
+ virtual 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.
@@ -484,11 +484,11 @@ public:
void clearMutableInlineStyleIfEmpty();
void setTabIndex(int);
- virtual short tabIndex() const OVERRIDE;
+ virtual short tabIndex() const override;
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
- virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) OVERRIDE;
+ virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
protected:
Element(const QualifiedName& tagName, Document*, ConstructionType);
@@ -500,9 +500,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;
+ virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
+ virtual void removedFrom(ContainerNode*) override;
+ virtual void childrenChanged(const ChildrenChange&) override;
virtual void willRecalcStyle(StyleRecalcChange);
virtual void didRecalcStyle(StyleRecalcChange);
@@ -579,8 +579,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;
+ virtual NodeType nodeType() const override final;
+ virtual bool childTypeAllowed(NodeType) const override final;
void setAttributeInternal(size_t index, const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
void appendAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
@@ -588,14 +588,14 @@ private:
void attributeChangedFromParserOrByCloning(const QualifiedName&, const AtomicString&, AttributeModificationReason);
#ifndef NDEBUG
- virtual void formatForDebugger(char* buffer, unsigned length) const OVERRIDE;
+ virtual void formatForDebugger(char* buffer, unsigned length) const override;
#endif
bool pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderStyle* newStyle);
void cancelFocusAppearanceUpdate();
- virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) OVERRIDE { return computedStyle(pseudoElementSpecifier); }
+ virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) override { return computedStyle(pseudoElementSpecifier); }
inline void updateCallbackSelectors(RenderStyle* oldStyle, RenderStyle* newStyle);
inline void removeCallbackSelectors();
@@ -603,7 +603,7 @@ private:
// cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
// are used instead.
- virtual PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep) OVERRIDE;
+ virtual 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/ElementData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698