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

Unified Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
index 3a22738bb7cd0279358dcd07820591980d98de35..a45a7e32a371e51a40a19ec75479fabc788e1468 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
@@ -306,7 +306,7 @@ void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate& update,
for (bool& flag : cancelRunningAnimationFlags)
flag = true;
- if (animationData && style.display() != EDisplay::None) {
+ if (animationData && style.display() != EDisplay::kNone) {
const Vector<AtomicString>& nameList = animationData->nameList();
for (size_t i = 0; i < nameList.size(); ++i) {
AtomicString name = nameList[i];
@@ -859,7 +859,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate& update,
HashSet<PropertyHandle> listedProperties;
bool anyTransitionHadTransitionAll = false;
const LayoutObject* layoutObject = animatingElement->layoutObject();
- if (!animationStyleRecalc && style.display() != EDisplay::None &&
+ if (!animationStyleRecalc && style.display() != EDisplay::kNone &&
layoutObject && layoutObject->style() && transitionData) {
TransitionUpdateState state = {
update, animatingElement, *layoutObject->style(),
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698