| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 #include <algorithm> | 33 #include <algorithm> |
| 34 #include "CSSPropertyNames.h" | 34 #include "CSSPropertyNames.h" |
| 35 #include "StylePropertyShorthand.h" | 35 #include "StylePropertyShorthand.h" |
| 36 #include "core/animation/css/CSSAnimations.h" | 36 #include "core/animation/css/CSSAnimations.h" |
| 37 #include "core/css/CSSCrossfadeValue.h" | 37 #include "core/css/CSSCrossfadeValue.h" |
| 38 #include "core/css/CSSImageValue.h" | 38 #include "core/css/CSSImageValue.h" |
| 39 #include "core/css/CSSPrimitiveValue.h" | 39 #include "core/css/CSSPrimitiveValue.h" |
| 40 #include "core/fetch/ImageResource.h" | 40 #include "core/fetch/ImageResource.h" |
| 41 #include "core/page/animation/AnimationBase.h" | 41 #include "core/page/animation/AnimationBase.h" |
| 42 #include "core/platform/FloatConversion.h" | |
| 43 #include "core/rendering/ClipPathOperation.h" | 42 #include "core/rendering/ClipPathOperation.h" |
| 44 #include "core/rendering/RenderBox.h" | 43 #include "core/rendering/RenderBox.h" |
| 45 #include "core/rendering/style/RenderStyle.h" | 44 #include "core/rendering/style/RenderStyle.h" |
| 46 #include "core/rendering/style/StyleFetchedImage.h" | 45 #include "core/rendering/style/StyleFetchedImage.h" |
| 47 #include "core/rendering/style/StyleGeneratedImage.h" | 46 #include "core/rendering/style/StyleGeneratedImage.h" |
| 47 #include "platform/FloatConversion.h" |
| 48 #include "wtf/Noncopyable.h" | 48 #include "wtf/Noncopyable.h" |
| 49 | 49 |
| 50 namespace WebCore { | 50 namespace WebCore { |
| 51 | 51 |
| 52 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) | 52 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) |
| 53 { | 53 { |
| 54 return blend(from, to, progress); | 54 return blend(from, to, progress); |
| 55 } | 55 } |
| 56 | 56 |
| 57 static inline unsigned blendFunc(const AnimationBase*, unsigned from, unsigned t
o, double progress) | 57 static inline unsigned blendFunc(const AnimationBase*, unsigned from, unsigned t
o, double progress) |
| (...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 } | 1270 } |
| 1271 | 1271 |
| 1272 int CSSPropertyAnimation::getNumProperties() | 1272 int CSSPropertyAnimation::getNumProperties() |
| 1273 { | 1273 { |
| 1274 ensurePropertyMap(); | 1274 ensurePropertyMap(); |
| 1275 | 1275 |
| 1276 return gPropertyWrappers->size(); | 1276 return gPropertyWrappers->size(); |
| 1277 } | 1277 } |
| 1278 | 1278 |
| 1279 } | 1279 } |
| OLD | NEW |