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

Unified Diff: third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.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/css/invalidation/StyleInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
index 211ec34b5f8a3781a22d8c9d8062384713822511..92f57e41ab98190d0a8884f777be412744217c49 100644
--- a/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
+++ b/third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp
@@ -44,7 +44,7 @@ void StyleInvalidator::scheduleInvalidationSetsForElement(const InvalidationList
ASSERT(element.inActiveDocument());
bool requiresDescendantInvalidation = false;
- if (element.styleChangeType() < SubtreeStyleChange) {
+ if (element.getStyleChangeType() < SubtreeStyleChange) {
for (auto& invalidationSet : invalidationLists.descendants) {
if (invalidationSet->wholeSubtreeInvalid()) {
element.setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::StyleInvalidator));
@@ -213,7 +213,7 @@ void StyleInvalidator::pushInvalidationSetsForElement(Element& element, Recursio
for (const auto& invalidationSet : pendingInvalidations->siblings())
siblingData.pushInvalidationSet(toSiblingInvalidationSet(*invalidationSet));
- if (element.styleChangeType() >= SubtreeStyleChange)
+ if (element.getStyleChangeType() >= SubtreeStyleChange)
return;
if (!pendingInvalidations->descendants().isEmpty()) {
@@ -234,7 +234,7 @@ ALWAYS_INLINE bool StyleInvalidator::checkInvalidationSetsAgainstElement(Element
return false;
bool thisElementNeedsStyleRecalc = false;
- if (element.styleChangeType() >= SubtreeStyleChange) {
+ if (element.getStyleChangeType() >= SubtreeStyleChange) {
recursionData.setWholeSubtreeInvalid();
} else {
thisElementNeedsStyleRecalc = recursionData.matchesCurrentInvalidationSets(element);

Powered by Google App Engine
This is Rietveld 408576698