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

Unified Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 years, 10 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: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index fe83bc5c5ed4fe08c91428ae7c554f359c19d6d6..53f79f17c4adc0595dfb52e20d5efb9f1b326e54 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -371,7 +371,7 @@ bool Element::hasAnimations() const
return elementAnimations && !elementAnimations->isEmpty();
}
-Node::NodeType Element::nodeType() const
+Node::NodeType Element::getNodeType() const
{
return ELEMENT_NODE;
}
@@ -1515,7 +1515,7 @@ void Element::attach(const AttachContext& context)
// We've already been through detach when doing an attach, but we might
// need to clear any state that's been added since then.
- if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
+ if (hasRareData() && getStyleChangeType() == NeedsReattachStyleChange) {
ElementRareData* data = elementRareData();
data->clearComputedStyle();
}
@@ -1779,7 +1779,7 @@ StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change)
}
}
- if (styleChangeType() >= SubtreeStyleChange)
+ if (getStyleChangeType() >= SubtreeStyleChange)
return Force;
if (change > Inherit || localChange > Inherit)
@@ -1860,7 +1860,7 @@ void Element::clearAnimationStyleChange()
void Element::setNeedsAnimationStyleRecalc()
{
- if (styleChangeType() != NoStyleChange)
+ if (getStyleChangeType() != NoStyleChange)
return;
setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Animation));

Powered by Google App Engine
This is Rietveld 408576698