third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp - Issue 1644883002: Add additive animation support for CSS property translate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1644883002: Add additive animation support for CSS property translate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_propertyInterpolationTypesMapping

Patch Set: Rebased Created 4 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/responsive/translate-responsive.html ('k') | third_party/WebKit/Source/core/animation/CSSTranslateInterpolationType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

index 7478f60e66e8b6d5d6b0f101b97b06f4b1f7c009..58d3c6587b5303ea0179a525bb73db86c5a59c44 100644

--- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

+++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

@@ -246,8 +246,9 @@ static double clampToRange(double x, ValueRange range)

static Length createLength(double pixels, double percentage, bool hasPercentage, ValueRange range)

{

- ASSERT(hasPercentage || percentage == 0);

- if (pixels && hasPercentage)

+ if (percentage != 0)

+ hasPercentage = true;

+ if (pixels != 0 && hasPercentage)

return Length(CalculationValue::create(PixelsAndPercent(pixels, percentage), range));

if (hasPercentage)

return Length(clampToRange(percentage, range), Percent);