| 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/css/CSSPrimitiveValue.h" | 37 #include "core/css/CSSPrimitiveValue.h" |
| 38 #include "core/css/StylePropertyShorthand.h" | 38 #include "core/css/StylePropertyShorthand.h" |
| 39 #include "core/loader/cache/CachedImage.h" | 39 #include "core/loader/cache/CachedImage.h" |
| 40 #include "core/page/animation/AnimationBase.h" | 40 #include "core/page/animation/AnimationBase.h" |
| 41 #include "core/platform/FloatConversion.h" | 41 #include "core/platform/FloatConversion.h" |
| 42 #include "core/rendering/ClipPathOperation.h" | 42 #include "core/rendering/ClipPathOperation.h" |
| 43 #include "core/rendering/RenderBox.h" | 43 #include "core/rendering/RenderBox.h" |
| 44 #include "core/rendering/style/RenderStyle.h" | 44 #include "core/rendering/style/RenderStyle.h" |
| 45 #include "core/rendering/style/StyleCachedImage.h" | 45 #include "core/rendering/style/StyleCachedImage.h" |
| 46 #include "core/rendering/style/StyleGeneratedImage.h" | 46 #include "core/rendering/style/StyleGeneratedImage.h" |
| 47 #include <wtf/Noncopyable.h> | 47 #include "wtf/Noncopyable.h" |
| 48 #include <wtf/RefCounted.h> | |
| 49 | 48 |
| 50 namespace WebCore { | 49 namespace WebCore { |
| 51 | 50 |
| 52 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) | 51 static inline int blendFunc(const AnimationBase*, int from, int to, double progr
ess) |
| 53 { | 52 { |
| 54 return blend(from, to, progress); | 53 return blend(from, to, progress); |
| 55 } | 54 } |
| 56 | 55 |
| 57 static inline unsigned blendFunc(const AnimationBase*, unsigned from, unsigned t
o, double progress) | 56 static inline unsigned blendFunc(const AnimationBase*, unsigned from, unsigned t
o, double progress) |
| 58 { | 57 { |
| (...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1240 } | 1239 } |
| 1241 | 1240 |
| 1242 int CSSPropertyAnimation::getNumProperties() | 1241 int CSSPropertyAnimation::getNumProperties() |
| 1243 { | 1242 { |
| 1244 ensurePropertyMap(); | 1243 ensurePropertyMap(); |
| 1245 | 1244 |
| 1246 return gPropertyWrappers->size(); | 1245 return gPropertyWrappers->size(); |
| 1247 } | 1246 } |
| 1248 | 1247 |
| 1249 } | 1248 } |
| OLD | NEW |