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

Side by Side Diff: sky/engine/core/animation/animatable/AnimatableValueKeyframe.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/engine/config.h"
6 #include "sky/engine/core/animation/animatable/AnimatableValueKeyframe.h" 5 #include "sky/engine/core/animation/animatable/AnimatableValueKeyframe.h"
7 6
8 #include "sky/engine/core/animation/LegacyStyleInterpolation.h" 7 #include "sky/engine/core/animation/LegacyStyleInterpolation.h"
9 8
10 namespace blink { 9 namespace blink {
11 10
12 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom) 11 AnimatableValueKeyframe::AnimatableValueKeyframe(const AnimatableValueKeyframe& copyFrom)
13 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) 12 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
14 { 13 {
15 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin (); iter != copyFrom.m_propertyValues.end(); ++iter) 14 for (PropertyValueMap::const_iterator iter = copyFrom.m_propertyValues.begin (); iter != copyFrom.m_propertyValues.end(); ++iter)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci ficKeyframe(end); 58 AnimatableValuePropertySpecificKeyframe* to = toAnimatableValuePropertySpeci ficKeyframe(end);
60 return LegacyStyleInterpolation::create(value(), to->value(), property); 59 return LegacyStyleInterpolation::create(value(), to->value(), property);
61 } 60 }
62 61
63 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property SpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easi ng) const 62 PassOwnPtr<Keyframe::PropertySpecificKeyframe> AnimatableValueKeyframe::Property SpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easi ng) const
64 { 63 {
65 return adoptPtr(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset , easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd)); 64 return adoptPtr(new AnimatableValueKeyframe::PropertySpecificKeyframe(offset , easing, AnimatableValue::neutralValue(), AnimationEffect::CompositeAdd));
66 } 65 }
67 66
68 } 67 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698