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

Side by Side Diff: Source/core/css/CSSTimingFunctionValue.h

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: Add comment to timing-functions test re. invalidity of step-middle in CSS 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CSSTimingFunctionValue_h 26 #ifndef CSSTimingFunctionValue_h
27 #define CSSTimingFunctionValue_h 27 #define CSSTimingFunctionValue_h
28 28
29 #include "core/css/CSSValue.h" 29 #include "core/css/CSSValue.h"
30 #include "platform/animation/TimingFunction.h"
30 #include "wtf/PassRefPtr.h" 31 #include "wtf/PassRefPtr.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 class CSSCubicBezierTimingFunctionValue : public CSSValue { 35 class CSSCubicBezierTimingFunctionValue : public CSSValue {
35 public: 36 public:
36 static PassRefPtr<CSSCubicBezierTimingFunctionValue> create(double x1, doubl e y1, double x2, double y2) 37 static PassRefPtr<CSSCubicBezierTimingFunctionValue> create(double x1, doubl e y1, double x2, double y2)
37 { 38 {
38 return adoptRef(new CSSCubicBezierTimingFunctionValue(x1, y1, x2, y2)); 39 return adoptRef(new CSSCubicBezierTimingFunctionValue(x1, y1, x2, y2));
39 } 40 }
(...skipping 20 matching lines...) Expand all
60 double m_x1; 61 double m_x1;
61 double m_y1; 62 double m_y1;
62 double m_x2; 63 double m_x2;
63 double m_y2; 64 double m_y2;
64 }; 65 };
65 66
66 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCubicBezierTimingFunctionValue, isCubicBezierTimi ngFunctionValue()); 67 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCubicBezierTimingFunctionValue, isCubicBezierTimi ngFunctionValue());
67 68
68 class CSSStepsTimingFunctionValue : public CSSValue { 69 class CSSStepsTimingFunctionValue : public CSSValue {
69 public: 70 public:
70 static PassRefPtr<CSSStepsTimingFunctionValue> create(int steps, bool stepAt Start) 71 static PassRefPtr<CSSStepsTimingFunctionValue> create(int steps, StepsTiming Function::StepAtPosition stepAtPosition)
71 { 72 {
72 return adoptRef(new CSSStepsTimingFunctionValue(steps, stepAtStart)); 73 return adoptRef(new CSSStepsTimingFunctionValue(steps, stepAtPosition));
73 } 74 }
74 75
75 int numberOfSteps() const { return m_steps; } 76 int numberOfSteps() const { return m_steps; }
76 bool stepAtStart() const { return m_stepAtStart; } 77 StepsTimingFunction::StepAtPosition stepAtPosition() const { return m_stepAt Position; }
77 78
78 String customCSSText() const; 79 String customCSSText() const;
79 80
80 bool equals(const CSSStepsTimingFunctionValue&) const; 81 bool equals(const CSSStepsTimingFunctionValue&) const;
81 82
82 private: 83 private:
83 CSSStepsTimingFunctionValue(int steps, bool stepAtStart) 84 CSSStepsTimingFunctionValue(int steps, StepsTimingFunction::StepAtPosition s tepAtPosition)
84 : CSSValue(StepsTimingFunctionClass) 85 : CSSValue(StepsTimingFunctionClass)
85 , m_steps(steps) 86 , m_steps(steps)
86 , m_stepAtStart(stepAtStart) 87 , m_stepAtPosition(stepAtPosition)
87 { 88 {
88 } 89 }
89 90
90 int m_steps; 91 int m_steps;
91 bool m_stepAtStart; 92 StepsTimingFunction::StepAtPosition m_stepAtPosition;
92 }; 93 };
93 94
94 DEFINE_CSS_VALUE_TYPE_CASTS(CSSStepsTimingFunctionValue, isStepsTimingFunctionVa lue()); 95 DEFINE_CSS_VALUE_TYPE_CASTS(CSSStepsTimingFunctionValue, isStepsTimingFunctionVa lue());
95 96
96 } // namespace 97 } // namespace
97 98
98 #endif 99 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698