| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "CSSPropertyAnimation.h" | 31 #include "CSSPropertyAnimation.h" |
| 32 | 32 |
| 33 #include <algorithm> |
| 33 #include "AnimationBase.h" | 34 #include "AnimationBase.h" |
| 34 #include "CSSCrossfadeValue.h" | 35 #include "CSSCrossfadeValue.h" |
| 35 #include "CSSImageGeneratorValue.h" | 36 #include "CSSImageGeneratorValue.h" |
| 36 #include "CSSImageValue.h" | 37 #include "CSSImageValue.h" |
| 37 #include "CSSPrimitiveValue.h" | 38 #include "CSSPrimitiveValue.h" |
| 38 #include "CSSPropertyNames.h" | 39 #include "CSSPropertyNames.h" |
| 39 #include "CachedImage.h" | 40 #include "CachedImage.h" |
| 40 #include "ClipPathOperation.h" | 41 #include "ClipPathOperation.h" |
| 41 #include "FloatConversion.h" | 42 #include "FloatConversion.h" |
| 42 #include "IdentityTransformOperation.h" | |
| 43 #include "Matrix3DTransformOperation.h" | |
| 44 #include "MatrixTransformOperation.h" | |
| 45 #include "RenderBox.h" | 43 #include "RenderBox.h" |
| 46 #include "RenderStyle.h" | 44 #include "RenderStyle.h" |
| 47 #include "StyleCachedImage.h" | 45 #include "StyleCachedImage.h" |
| 48 #include "StyleGeneratedImage.h" | 46 #include "StyleGeneratedImage.h" |
| 49 #include "StylePropertyShorthand.h" | 47 #include "StylePropertyShorthand.h" |
| 50 #include "StyleResolver.h" | 48 #include "StyleResolver.h" |
| 51 #include <algorithm> | 49 #include "core/platform/graphics/transforms/IdentityTransformOperation.h" |
| 50 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h" |
| 51 #include "core/platform/graphics/transforms/MatrixTransformOperation.h" |
| 52 #include <wtf/Noncopyable.h> | 52 #include <wtf/Noncopyable.h> |
| 53 #include <wtf/RefCounted.h> | 53 #include <wtf/RefCounted.h> |
| 54 | 54 |
| 55 namespace WebCore { | 55 namespace WebCore { |
| 56 | 56 |
| 57 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) | 57 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) |
| 58 { | 58 { |
| 59 return blend(from, to, progress); | 59 return blend(from, to, progress); |
| 60 } | 60 } |
| 61 | 61 |
| (...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 } | 1293 } |
| 1294 | 1294 |
| 1295 int CSSPropertyAnimation::getNumProperties() | 1295 int CSSPropertyAnimation::getNumProperties() |
| 1296 { | 1296 { |
| 1297 ensurePropertyMap(); | 1297 ensurePropertyMap(); |
| 1298 | 1298 |
| 1299 return gPropertyWrappers->size(); | 1299 return gPropertyWrappers->size(); |
| 1300 } | 1300 } |
| 1301 | 1301 |
| 1302 } | 1302 } |
| OLD | NEW |