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

Unified Diff: third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp

Issue 2682603004: Don't animate visibility keyframes that don't include "visible" (Closed)
Patch Set: git squash commit for _fixVisibilityMerge. Created 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/interpolation/visibility-interpolation.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp
index fa1abf6b151d276bbd55e1852d7b310f3a6a0c8d..5013edfba20da8423228fec1e3439ac1dffaf37f 100644
--- a/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp
@@ -161,13 +161,21 @@ CSSVisibilityInterpolationType::maybeConvertStandardPropertyUnderlyingValue(
PairwiseInterpolationValue CSSVisibilityInterpolationType::maybeMergeSingles(
InterpolationValue&& start,
InterpolationValue&& end) const {
- return PairwiseInterpolationValue(
- InterpolableNumber::create(0), InterpolableNumber::create(1),
- CSSVisibilityNonInterpolableValue::create(
- toCSSVisibilityNonInterpolableValue(*start.nonInterpolableValue)
- .visibility(),
- toCSSVisibilityNonInterpolableValue(*end.nonInterpolableValue)
- .visibility()));
+ EVisibility startVisibility =
+ toCSSVisibilityNonInterpolableValue(*start.nonInterpolableValue)
+ .visibility();
+ EVisibility endVisibility =
+ toCSSVisibilityNonInterpolableValue(*end.nonInterpolableValue)
+ .visibility();
+ if (startVisibility != endVisibility &&
+ startVisibility != EVisibility::kVisible &&
+ endVisibility != EVisibility::kVisible) {
+ return nullptr;
+ }
+ return PairwiseInterpolationValue(InterpolableNumber::create(0),
+ InterpolableNumber::create(1),
+ CSSVisibilityNonInterpolableValue::create(
+ startVisibility, endVisibility));
}
void CSSVisibilityInterpolationType::composite(
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/interpolation/visibility-interpolation.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698