| 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(),
|
|
|