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

Unified Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 149363002: Web Animations API: Implement step-middle and steps(x, middle) timing functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix TimingFunctionTestHelperTest Created 6 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
Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 2b941b5d8f22f06f4b2ef326f4f26775ab28f913..f15c4ee9fbd7e5a779234acd289cf7822f8e22d0 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -1021,13 +1021,19 @@ static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timi
case TimingFunction::StepsFunction:
{
const StepsTimingFunction* stepsTimingFunction = toStepsTimingFunction(timingFunction);
- if (stepsTimingFunction->subType() == StepsTimingFunction::Custom)
- return CSSStepsTimingFunctionValue::create(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtStart());
+ if (stepsTimingFunction->subType() == StepsTimingFunction::Custom) {
+ if (stepsTimingFunction->stepAtPosition() != StepsTimingFunction::StepAtMiddle)
dstockwell 2014/02/24 04:58:40 Probably better to invert this condition. Need a
rjwright 2014/02/24 11:17:46 Redundant and removed altogether.
+ return CSSStepsTimingFunctionValue::create(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtPosition());
+ return cssValuePool().createIdentifierValue(CSSValueLinear);
dstockwell 2014/02/24 04:58:40 Why Linear rather than Ease?
rjwright 2014/02/24 11:17:46 Oops. Yes, this should be ease (Although it also s
+ }
CSSValueID valueId;
switch (stepsTimingFunction->subType()) {
case StepsTimingFunction::Start:
valueId = CSSValueStepStart;
break;
+ case StepsTimingFunction::Middle:
+ valueId = CSSValueLinear;
+ break;
case StepsTimingFunction::End:
valueId = CSSValueStepEnd;
break;

Powered by Google App Engine
This is Rietveld 408576698