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

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

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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/animatable/AnimatableDouble.h" 32 #include "core/animation/animatable/AnimatableDouble.h"
33 33
34 #include "platform/animation/AnimationUtilities.h" 34 #include "platform/animation/AnimationUtilities.h"
35 #include <math.h> 35 #include <math.h>
36 36
37 namespace blink { 37 namespace blink {
38 38
39 bool AnimatableDouble::usesDefaultInterpolationWith(const AnimatableValue* value ) const
40 {
41 const AnimatableDouble* other = toAnimatableDouble(value);
42 return (m_constraint == InterpolationIsNonContinuousWithZero) && (!m_number || !other->m_number);
43 }
44
45 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableDouble::interpolateTo(const An imatableValue* value, double fraction) const 39 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableDouble::interpolateTo(const An imatableValue* value, double fraction) const
46 { 40 {
47 const AnimatableDouble* other = toAnimatableDouble(value); 41 const AnimatableDouble* other = toAnimatableDouble(value);
48 ASSERT(m_constraint == other->m_constraint);
49 if ((m_constraint == InterpolationIsNonContinuousWithZero) && (!m_number || !other->m_number))
50 return defaultInterpolateTo(this, value, fraction);
51 return AnimatableDouble::create(blend(m_number, other->m_number, fraction)); 42 return AnimatableDouble::create(blend(m_number, other->m_number, fraction));
52 } 43 }
53 44
54 bool AnimatableDouble::equalTo(const AnimatableValue* value) const 45 bool AnimatableDouble::equalTo(const AnimatableValue* value) const
55 { 46 {
56 return m_number == toAnimatableDouble(value)->m_number; 47 return m_number == toAnimatableDouble(value)->m_number;
57 } 48 }
58 49
59 } // namespace blink 50 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableDouble.h ('k') | Source/core/animation/css/CSSAnimatableValueFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698