| 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 19 matching lines...) Expand all Loading... |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "CSSPropertyAnimation.h" | 31 #include "CSSPropertyAnimation.h" |
| 32 | 32 |
| 33 #include <algorithm> | 33 #include <algorithm> |
| 34 #include "AnimationBase.h" | 34 #include "AnimationBase.h" |
| 35 #include "CSSCrossfadeValue.h" | 35 #include "CSSCrossfadeValue.h" |
| 36 #include "CSSImageGeneratorValue.h" | 36 #include "CSSImageGeneratorValue.h" |
| 37 #include "CSSImageValue.h" | 37 #include "CSSImageValue.h" |
| 38 #include "CSSPrimitiveValue.h" | 38 #include "CSSPrimitiveValue.h" |
| 39 #include "CSSPropertyNames.h" | 39 #include "CSSPropertyNames.h" |
| 40 #include "CachedImage.h" | |
| 41 #include "StylePropertyShorthand.h" | 40 #include "StylePropertyShorthand.h" |
| 42 #include "StyleResolver.h" | 41 #include "StyleResolver.h" |
| 42 #include "core/loader/cache/CachedImage.h" |
| 43 #include "core/platform/FloatConversion.h" | 43 #include "core/platform/FloatConversion.h" |
| 44 #include "core/platform/graphics/transforms/IdentityTransformOperation.h" | 44 #include "core/platform/graphics/transforms/IdentityTransformOperation.h" |
| 45 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h" | 45 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h" |
| 46 #include "core/platform/graphics/transforms/MatrixTransformOperation.h" | 46 #include "core/platform/graphics/transforms/MatrixTransformOperation.h" |
| 47 #include "core/rendering/ClipPathOperation.h" | 47 #include "core/rendering/ClipPathOperation.h" |
| 48 #include "core/rendering/RenderBox.h" | 48 #include "core/rendering/RenderBox.h" |
| 49 #include "core/rendering/style/RenderStyle.h" | 49 #include "core/rendering/style/RenderStyle.h" |
| 50 #include "core/rendering/style/StyleCachedImage.h" | 50 #include "core/rendering/style/StyleCachedImage.h" |
| 51 #include "core/rendering/style/StyleGeneratedImage.h" | 51 #include "core/rendering/style/StyleGeneratedImage.h" |
| 52 #include <wtf/Noncopyable.h> | 52 #include <wtf/Noncopyable.h> |
| (...skipping 1240 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 |