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

Unified Diff: third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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/animation/animatable/AnimatableVisibility.cpp
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
index 577dc1bdaaa9cd30e22631a2f11d9640aa05e223..0f7f049f573375005575da3dc68e8bafe4cd10b3 100644
--- a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
+++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
@@ -36,7 +36,7 @@ bool AnimatableVisibility::usesDefaultInterpolationWith(
const AnimatableValue* value) const {
EVisibility from = m_visibility;
EVisibility to = toAnimatableVisibility(value)->m_visibility;
- return from != EVisibility::Visible && to != EVisibility::Visible;
+ return from != EVisibility::kVisible && to != EVisibility::kVisible;
}
PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(
@@ -44,13 +44,13 @@ PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(
double fraction) const {
EVisibility from = m_visibility;
EVisibility to = toAnimatableVisibility(value)->m_visibility;
- if (from != EVisibility::Visible && to != EVisibility::Visible)
+ if (from != EVisibility::kVisible && to != EVisibility::kVisible)
return defaultInterpolateTo(this, value, fraction);
if (fraction <= 0)
return takeConstRef(this);
if (fraction >= 1)
return takeConstRef(value);
- return takeConstRef(from == EVisibility::Visible ? this : value);
+ return takeConstRef(from == EVisibility::kVisible ? this : value);
}
bool AnimatableVisibility::equalTo(const AnimatableValue* value) const {

Powered by Google App Engine
This is Rietveld 408576698