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

Side by Side Diff: Source/core/animation/animatable/AnimatableDouble.h

Issue 1300323003: Make flex-grow and flex-shrink interpolation continuous with 0 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update test Created 5 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/animation/animatable/AnimatableValue.h" 35 #include "core/animation/animatable/AnimatableValue.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class CORE_EXPORT AnimatableDouble final : public AnimatableValue { 39 class CORE_EXPORT AnimatableDouble final : public AnimatableValue {
40 public: 40 public:
41 ~AnimatableDouble() override { } 41 ~AnimatableDouble() override { }
42 42
43 enum Constraint { 43 static PassRefPtrWillBeRawPtr<AnimatableDouble> create(double number)
44 Unconstrained,
45 InterpolationIsNonContinuousWithZero,
46 };
47
48 static PassRefPtrWillBeRawPtr<AnimatableDouble> create(double number, Constr aint constraint = Unconstrained)
49 { 44 {
50 return adoptRefWillBeNoop(new AnimatableDouble(number, constraint)); 45 return adoptRefWillBeNoop(new AnimatableDouble(number));
51 } 46 }
52 47
53 double toDouble() const { return m_number; } 48 double toDouble() const { return m_number; }
54 49
55 DEFINE_INLINE_VIRTUAL_TRACE() { AnimatableValue::trace(visitor); } 50 DEFINE_INLINE_VIRTUAL_TRACE() { AnimatableValue::trace(visitor); }
56 51
57 protected: 52 protected:
58 PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue* , double fraction) const override; 53 PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue* , double fraction) const override;
59 bool usesDefaultInterpolationWith(const AnimatableValue*) const override;
60 54
61 private: 55 private:
62 AnimatableDouble(double number, Constraint constraint) 56 AnimatableDouble(double number)
63 : m_number(number) 57 : m_number(number)
64 , m_constraint(constraint)
65 { 58 {
66 } 59 }
67 AnimatableType type() const override { return TypeDouble; } 60 AnimatableType type() const override { return TypeDouble; }
68 bool equalTo(const AnimatableValue*) const override; 61 bool equalTo(const AnimatableValue*) const override;
69 62
70 double m_number; 63 double m_number;
71 Constraint m_constraint;
72 }; 64 };
73 65
74 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableDouble, isDouble()); 66 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableDouble, isDouble());
75 67
76 } // namespace blink 68 } // namespace blink
77 69
78 #endif // AnimatableDouble_h 70 #endif // AnimatableDouble_h
OLDNEW
« no previous file with comments | « LayoutTests/transitions/flex-transitions-expected.txt ('k') | Source/core/animation/animatable/AnimatableDouble.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698