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

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

Issue 645443003: Move parts of core/dom to C++11 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed nit 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/DocumentSupplementable.h ('k') | Source/core/dom/Element.cpp » ('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 a649ad0b3e661a80b1afccfa029a05a6614e7bc0..8b9692cce616bed8bd099f098882140664963d1c 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -211,7 +211,7 @@ public:
PassRefPtrWillBeRawPtr<Attr> attrIfExists(const QualifiedName&);
PassRefPtrWillBeRawPtr<Attr> ensureAttr(const QualifiedName&);
- WillBeHeapVector<RefPtrWillBeMember<Attr> >* attrNodeList();
+ WillBeHeapVector<RefPtrWillBeMember<Attr>>* attrNodeList();
CSSStyleDeclaration* style();
@@ -247,10 +247,10 @@ public:
void setBooleanAttribute(const QualifiedName& name, bool);
- virtual const StylePropertySet* additionalPresentationAttributeStyle() { return 0; }
+ virtual const StylePropertySet* additionalPresentationAttributeStyle() { return nullptr; }
void invalidateStyleAttribute();
- const StylePropertySet* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : 0; }
+ const StylePropertySet* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : nullptr; }
bool setInlineStyleProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
bool setInlineStyleProperty(CSSPropertyID, double value, CSSPrimitiveValue::UnitType, bool important = false);
@@ -302,7 +302,7 @@ public:
virtual void detach(const AttachContext& = AttachContext()) override;
virtual RenderObject* createRenderer(RenderStyle*);
virtual bool rendererIsNeeded(const RenderStyle&);
- void recalcStyle(StyleRecalcChange, Text* nextTextSibling = 0);
+ void recalcStyle(StyleRecalcChange, Text* nextTextSibling = nullptr);
void pseudoStateChanged(CSSSelector::PseudoType);
void setAnimationStyleChange(bool);
void setNeedsAnimationStyleRecalc();
@@ -351,7 +351,7 @@ public:
KURL getNonEmptyURLAttribute(const QualifiedName&) const;
virtual const AtomicString imageSourceURL() const;
- virtual Image* imageContents() { return 0; }
+ virtual Image* imageContents() { return nullptr; }
virtual void focus(bool restorePreviousSelection = true, FocusType = FocusTypeNone);
virtual void updateFocusAppearance(bool restorePreviousSelection);
@@ -622,7 +622,7 @@ private:
ElementRareData* elementRareData() const;
ElementRareData& ensureElementRareData();
- WillBeHeapVector<RefPtrWillBeMember<Attr> >& ensureAttrNodeList();
+ WillBeHeapVector<RefPtrWillBeMember<Attr>>& ensureAttrNodeList();
void removeAttrNodeList();
void detachAllAttrNodesFromElement();
void detachAttrNodeFromElementWithValue(Attr*, const AtomicString& value);
@@ -672,7 +672,7 @@ inline bool isDisabledFormControl(const Node* node)
inline Element* Node::parentElement() const
{
ContainerNode* parent = parentNode();
- return parent && parent->isElementNode() ? toElement(parent) : 0;
+ return parent && parent->isElementNode() ? toElement(parent) : nullptr;
}
inline bool Element::fastHasAttribute(const QualifiedName& name) const
@@ -806,7 +806,7 @@ inline void Element::invalidateStyleAttribute()
inline const StylePropertySet* Element::presentationAttributeStyle()
{
if (!elementData())
- return 0;
+ return nullptr;
if (elementData()->m_presentationAttributeStyleIsDirty)
updatePresentationAttributeStyle();
// Need to call elementData() again since updatePresentationAttributeStyle()
« no previous file with comments | « Source/core/dom/DocumentSupplementable.h ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698