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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 1765933003: style: Rename the PseudoId enum values to CamelCase and prefix them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enum-clash-PseudoId: none Created 4 years, 9 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/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 415902e4a61f18ab9c1d2ae278ad881c28a7c877..30078b09d3c9cf3af4c21f3a42cbfea672641b0d 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -162,7 +162,7 @@ static StyleRecalcChange diffPseudoStyles(const ComputedStyle& oldStyle, const C
// because setStyle will do the right thing with anything else.
if (!oldStyle.hasAnyPublicPseudoStyles())
return NoChange;
- for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < FIRST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
+ for (PseudoId pseudoId = FirstPublicPseudoId; pseudoId < FirstInternalPseudoId; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
if (!oldStyle.hasPseudoStyle(pseudoId))
continue;
const ComputedStyle* newPseudoStyle = newStyle.getCachedPseudoStyle(pseudoId);
@@ -184,7 +184,7 @@ StyleRecalcChange ComputedStyle::stylePropagationDiff(const ComputedStyle* oldSt
return NoChange;
if (oldStyle->display() != newStyle->display()
- || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FIRST_LETTER)
+ || oldStyle->hasPseudoStyle(PseudoIdFirstLetter) != newStyle->hasPseudoStyle(PseudoIdFirstLetter)
|| !oldStyle->contentDataEquivalent(newStyle)
|| oldStyle->hasTextCombine() != newStyle->hasTextCombine()
|| oldStyle->justifyItems() != newStyle->justifyItems()) // TODO (lajava): We must avoid this Reattach.
@@ -360,7 +360,7 @@ bool ComputedStyle::isStyleAvailable() const
bool ComputedStyle::hasUniquePseudoStyle() const
{
- if (!m_cachedPseudoStyles || styleType() != NOPSEUDO)
+ if (!m_cachedPseudoStyles || styleType() != PseudoIdNone)
return false;
for (size_t i = 0; i < m_cachedPseudoStyles->size(); ++i) {
@@ -377,7 +377,7 @@ ComputedStyle* ComputedStyle::getCachedPseudoStyle(PseudoId pid) const
if (!m_cachedPseudoStyles || !m_cachedPseudoStyles->size())
return 0;
- if (styleType() != NOPSEUDO)
+ if (styleType() != PseudoIdNone)
return 0;
for (size_t i = 0; i < m_cachedPseudoStyles->size(); ++i) {
@@ -394,7 +394,7 @@ ComputedStyle* ComputedStyle::addCachedPseudoStyle(PassRefPtr<ComputedStyle> pse
if (!pseudo)
return 0;
- ASSERT(pseudo->styleType() > NOPSEUDO);
+ ASSERT(pseudo->styleType() > PseudoIdNone);
ComputedStyle* result = pseudo.get();
@@ -664,7 +664,7 @@ bool ComputedStyle::diffNeedsFullLayoutAndPaintInvalidation(const ComputedStyle&
return true;
}
- if (hasPseudoStyle(SCROLLBAR) != other.hasPseudoStyle(SCROLLBAR))
+ if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScrollbar))
return true;
// Movement of non-static-positioned object is special cased in ComputedStyle::visualInvalidationDiff().
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698