Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 24 matching lines...) Expand all Loading... | |
| 35 #include "core/animation/AnimatableUnknown.h" | 35 #include "core/animation/AnimatableUnknown.h" |
| 36 #include "core/css/CSSPrimitiveValue.h" | 36 #include "core/css/CSSPrimitiveValue.h" |
| 37 #include "core/css/parser/BisonCSSParser.h" | 37 #include "core/css/parser/BisonCSSParser.h" |
| 38 #include "core/css/resolver/CSSToStyleMap.h" | 38 #include "core/css/resolver/CSSToStyleMap.h" |
| 39 #include <gtest/gtest.h> | 39 #include <gtest/gtest.h> |
| 40 | 40 |
| 41 using namespace WebCore; | 41 using namespace WebCore; |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 const double kDuration = 1.0; | |
|
shans
2014/03/21 04:41:41
'duration'
Eric Willigers
2014/03/21 04:52:30
Done.
| |
| 46 | |
| 45 PassRefPtr<AnimatableValue> unknownAnimatableValue(double n) | 47 PassRefPtr<AnimatableValue> unknownAnimatableValue(double n) |
| 46 { | 48 { |
| 47 return AnimatableUnknown::create(CSSPrimitiveValue::create(n, CSSPrimitiveVa lue::CSS_UNKNOWN).get()); | 49 return AnimatableUnknown::create(CSSPrimitiveValue::create(n, CSSPrimitiveVa lue::CSS_UNKNOWN).get()); |
| 48 } | 50 } |
| 49 | 51 |
| 50 PassRefPtr<AnimatableValue> pixelAnimatableValue(double n) | 52 PassRefPtr<AnimatableValue> pixelAnimatableValue(double n) |
| 51 { | 53 { |
| 52 return AnimatableLength::create(CSSPrimitiveValue::create(n, CSSPrimitiveVal ue::CSS_PX).get()); | 54 return AnimatableLength::create(CSSPrimitiveValue::create(n, CSSPrimitiveVal ue::CSS_PX).get()); |
| 53 } | 55 } |
| 54 | 56 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 return value; | 96 return value; |
| 95 } | 97 } |
| 96 return 0; | 98 return 0; |
| 97 } | 99 } |
| 98 | 100 |
| 99 | 101 |
| 100 TEST(AnimationKeyframeEffectModel, BasicOperation) | 102 TEST(AnimationKeyframeEffectModel, BasicOperation) |
| 101 { | 103 { |
| 102 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); | 104 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); |
| 103 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 105 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 104 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6); | 106 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6, kDur ation); |
| 105 ASSERT_EQ(1UL, values->size()); | 107 ASSERT_EQ(1UL, values->size()); |
| 106 expectProperty(CSSPropertyLeft, values->at(0)); | 108 expectProperty(CSSPropertyLeft, values->at(0)); |
| 107 expectDoubleValue(5.0, values->at(0)); | 109 expectDoubleValue(5.0, values->at(0)); |
| 108 } | 110 } |
| 109 | 111 |
| 110 TEST(AnimationKeyframeEffectModel, CompositeReplaceNonInterpolable) | 112 TEST(AnimationKeyframeEffectModel, CompositeReplaceNonInterpolable) |
| 111 { | 113 { |
| 112 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); | 114 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); |
| 113 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 115 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 114 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 116 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 115 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 117 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 116 expectDoubleValue(5.0, effect->sample(0, 0.6)->at(0)); | 118 expectDoubleValue(5.0, effect->sample(0, 0.6, kDuration)->at(0)); |
| 117 } | 119 } |
| 118 | 120 |
| 119 TEST(AnimationKeyframeEffectModel, CompositeReplace) | 121 TEST(AnimationKeyframeEffectModel, CompositeReplace) |
| 120 { | 122 { |
| 121 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 123 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 122 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 124 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 123 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 125 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 124 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 126 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 125 expectDoubleValue(3.0 * 0.4 + 5.0 * 0.6, effect->sample(0, 0.6)->at(0)); | 127 expectDoubleValue(3.0 * 0.4 + 5.0 * 0.6, effect->sample(0, 0.6, kDuration)-> at(0)); |
| 126 } | 128 } |
| 127 | 129 |
| 128 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 130 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 129 TEST(AnimationKeyframeEffectModel, DISABLED_CompositeAdd) | 131 TEST(AnimationKeyframeEffectModel, DISABLED_CompositeAdd) |
| 130 { | 132 { |
| 131 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 133 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 132 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); | 134 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); |
| 133 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); | 135 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); |
| 134 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 136 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 135 expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, effect->sample(0, 0 .6)->at(0)); | 137 expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, effect->sample(0, 0 .6, kDuration)->at(0)); |
| 136 } | 138 } |
| 137 | 139 |
| 138 TEST(AnimationKeyframeEffectModel, CompositeEaseIn) | 140 TEST(AnimationKeyframeEffectModel, CompositeEaseIn) |
| 139 { | 141 { |
| 140 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 142 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 141 RefPtrWillBeRawPtr<CSSValue> timingFunction = BisonCSSParser::parseAnimation TimingFunctionValue("ease-in"); | 143 RefPtrWillBeRawPtr<CSSValue> timingFunction = BisonCSSParser::parseAnimation TimingFunctionValue("ease-in"); |
| 142 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 144 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 143 keyframes[0]->setEasing(CSSToStyleMap::animationTimingFunction(timingFunctio n.get(), false)); | 145 keyframes[0]->setEasing(CSSToStyleMap::animationTimingFunction(timingFunctio n.get(), false)); |
| 144 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 146 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 145 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 147 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 146 expectDoubleValue(3.8582394, effect->sample(0, 0.6)->at(0)); | 148 expectDoubleValue(3.8579516, effect->sample(0, 0.6, kDuration)->at(0)); |
| 149 expectDoubleValue(3.8582394, effect->sample(0, 0.6, kDuration * 100)->at(0)) ; | |
| 147 } | 150 } |
| 148 | 151 |
| 149 TEST(AnimationKeyframeEffectModel, CompositeCubicBezier) | 152 TEST(AnimationKeyframeEffectModel, CompositeCubicBezier) |
| 150 { | 153 { |
| 151 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 154 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 152 RefPtrWillBeRawPtr<CSSValue> timingFunction = BisonCSSParser::parseAnimation TimingFunctionValue("cubic-bezier(0.42, 0, 0.58, 1)"); | 155 RefPtrWillBeRawPtr<CSSValue> timingFunction = BisonCSSParser::parseAnimation TimingFunctionValue("cubic-bezier(0.42, 0, 0.58, 1)"); |
| 153 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 156 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 154 keyframes[0]->setEasing(CSSToStyleMap::animationTimingFunction(timingFunctio n.get(), false)); | 157 keyframes[0]->setEasing(CSSToStyleMap::animationTimingFunction(timingFunctio n.get(), false)); |
| 155 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 158 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 156 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 159 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 157 expectDoubleValue(4.3362322, effect->sample(0, 0.6)->at(0)); | 160 expectDoubleValue(4.3363357, effect->sample(0, 0.6, kDuration)->at(0)); |
| 161 expectDoubleValue(4.3362322, effect->sample(0, 0.6, kDuration * 1000)->at(0) ); | |
| 158 } | 162 } |
| 159 | 163 |
| 160 TEST(AnimationKeyframeEffectModel, ExtrapolateReplaceNonInterpolable) | 164 TEST(AnimationKeyframeEffectModel, ExtrapolateReplaceNonInterpolable) |
| 161 { | 165 { |
| 162 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); | 166 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(unknow nAnimatableValue(3.0), unknownAnimatableValue(5.0)); |
| 163 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 167 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 164 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 168 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 165 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 169 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 166 expectDoubleValue(5.0, effect->sample(0, 1.6)->at(0)); | 170 expectDoubleValue(5.0, effect->sample(0, 1.6, kDuration)->at(0)); |
| 167 } | 171 } |
| 168 | 172 |
| 169 TEST(AnimationKeyframeEffectModel, ExtrapolateReplace) | 173 TEST(AnimationKeyframeEffectModel, ExtrapolateReplace) |
| 170 { | 174 { |
| 171 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 175 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 172 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 176 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 173 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); | 177 keyframes[0]->setComposite(AnimationEffect::CompositeReplace); |
| 174 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); | 178 keyframes[1]->setComposite(AnimationEffect::CompositeReplace); |
| 175 expectDoubleValue(3.0 * -0.6 + 5.0 * 1.6, effect->sample(0, 1.6)->at(0)); | 179 expectDoubleValue(3.0 * -0.6 + 5.0 * 1.6, effect->sample(0, 1.6, kDuration)- >at(0)); |
| 176 } | 180 } |
| 177 | 181 |
| 178 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 182 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 179 TEST(AnimationKeyframeEffectModel, DISABLED_ExtrapolateAdd) | 183 TEST(AnimationKeyframeEffectModel, DISABLED_ExtrapolateAdd) |
| 180 { | 184 { |
| 181 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 185 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 182 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); | 186 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); |
| 183 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); | 187 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); |
| 184 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 188 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 185 expectDoubleValue((7.0 + 3.0) * -0.6 + (7.0 + 5.0) * 1.6, effect->sample(0, 1.6)->at(0)); | 189 expectDoubleValue((7.0 + 3.0) * -0.6 + (7.0 + 5.0) * 1.6, effect->sample(0, 1.6, kDuration)->at(0)); |
| 186 } | 190 } |
| 187 | 191 |
| 188 TEST(AnimationKeyframeEffectModel, ZeroKeyframes) | 192 TEST(AnimationKeyframeEffectModel, ZeroKeyframes) |
| 189 { | 193 { |
| 190 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (KeyframeEffectModel::KeyframeVector()); | 194 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (KeyframeEffectModel::KeyframeVector()); |
| 191 EXPECT_TRUE(effect->sample(0, 0.5)->isEmpty()); | 195 EXPECT_TRUE(effect->sample(0, 0.5, kDuration)->isEmpty()); |
| 192 } | 196 } |
| 193 | 197 |
| 194 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 198 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 195 TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetZero) | 199 TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetZero) |
| 196 { | 200 { |
| 197 KeyframeEffectModel::KeyframeVector keyframes(1); | 201 KeyframeEffectModel::KeyframeVector keyframes(1); |
| 198 keyframes[0] = Keyframe::create(); | 202 keyframes[0] = Keyframe::create(); |
| 199 keyframes[0]->setOffset(0.0); | 203 keyframes[0]->setOffset(0.0); |
| 200 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); | 204 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); |
| 201 | 205 |
| 202 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 206 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 203 expectDoubleValue(3.0, effect->sample(0, 0.6)->at(0)); | 207 expectDoubleValue(3.0, effect->sample(0, 0.6, kDuration)->at(0)); |
| 204 } | 208 } |
| 205 | 209 |
| 206 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 210 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 207 TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetOne) | 211 TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetOne) |
| 208 { | 212 { |
| 209 KeyframeEffectModel::KeyframeVector keyframes(1); | 213 KeyframeEffectModel::KeyframeVector keyframes(1); |
| 210 keyframes[0] = Keyframe::create(); | 214 keyframes[0] = Keyframe::create(); |
| 211 keyframes[0]->setOffset(1.0); | 215 keyframes[0]->setOffset(1.0); |
| 212 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).ge t()); | 216 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).ge t()); |
| 213 | 217 |
| 214 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 218 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 215 expectDoubleValue(7.0 * 0.4 + 5.0 * 0.6, effect->sample(0, 0.6)->at(0)); | 219 expectDoubleValue(7.0 * 0.4 + 5.0 * 0.6, effect->sample(0, 0.6, kDuration)-> at(0)); |
| 216 } | 220 } |
| 217 | 221 |
| 218 TEST(AnimationKeyframeEffectModel, MoreThanTwoKeyframes) | 222 TEST(AnimationKeyframeEffectModel, MoreThanTwoKeyframes) |
| 219 { | 223 { |
| 220 KeyframeEffectModel::KeyframeVector keyframes(3); | 224 KeyframeEffectModel::KeyframeVector keyframes(3); |
| 221 keyframes[0] = Keyframe::create(); | 225 keyframes[0] = Keyframe::create(); |
| 222 keyframes[0]->setOffset(0.0); | 226 keyframes[0]->setOffset(0.0); |
| 223 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); | 227 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); |
| 224 keyframes[1] = Keyframe::create(); | 228 keyframes[1] = Keyframe::create(); |
| 225 keyframes[1]->setOffset(0.5); | 229 keyframes[1]->setOffset(0.5); |
| 226 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); | 230 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); |
| 227 keyframes[2] = Keyframe::create(); | 231 keyframes[2] = Keyframe::create(); |
| 228 keyframes[2]->setOffset(1.0); | 232 keyframes[2]->setOffset(1.0); |
| 229 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); | 233 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); |
| 230 | 234 |
| 231 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 235 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 232 expectDoubleValue(4.0, effect->sample(0, 0.3)->at(0)); | 236 expectDoubleValue(4.0, effect->sample(0, 0.3, kDuration)->at(0)); |
| 233 expectDoubleValue(5.0, effect->sample(0, 0.8)->at(0)); | 237 expectDoubleValue(5.0, effect->sample(0, 0.8, kDuration)->at(0)); |
| 234 } | 238 } |
| 235 | 239 |
| 236 TEST(AnimationKeyframeEffectModel, EndKeyframeOffsetsUnspecified) | 240 TEST(AnimationKeyframeEffectModel, EndKeyframeOffsetsUnspecified) |
| 237 { | 241 { |
| 238 KeyframeEffectModel::KeyframeVector keyframes(3); | 242 KeyframeEffectModel::KeyframeVector keyframes(3); |
| 239 keyframes[0] = Keyframe::create(); | 243 keyframes[0] = Keyframe::create(); |
| 240 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); | 244 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); |
| 241 keyframes[1] = Keyframe::create(); | 245 keyframes[1] = Keyframe::create(); |
| 242 keyframes[1]->setOffset(0.5); | 246 keyframes[1]->setOffset(0.5); |
| 243 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); | 247 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); |
| 244 keyframes[2] = Keyframe::create(); | 248 keyframes[2] = Keyframe::create(); |
| 245 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); | 249 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); |
| 246 | 250 |
| 247 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 251 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 248 expectDoubleValue(3.0, effect->sample(0, 0.1)->at(0)); | 252 expectDoubleValue(3.0, effect->sample(0, 0.1, kDuration)->at(0)); |
| 249 expectDoubleValue(4.0, effect->sample(0, 0.6)->at(0)); | 253 expectDoubleValue(4.0, effect->sample(0, 0.6, kDuration)->at(0)); |
| 250 expectDoubleValue(5.0, effect->sample(0, 0.9)->at(0)); | 254 expectDoubleValue(5.0, effect->sample(0, 0.9, kDuration)->at(0)); |
| 251 } | 255 } |
| 252 | 256 |
| 253 TEST(AnimationKeyframeEffectModel, SampleOnKeyframe) | 257 TEST(AnimationKeyframeEffectModel, SampleOnKeyframe) |
| 254 { | 258 { |
| 255 KeyframeEffectModel::KeyframeVector keyframes(3); | 259 KeyframeEffectModel::KeyframeVector keyframes(3); |
| 256 keyframes[0] = Keyframe::create(); | 260 keyframes[0] = Keyframe::create(); |
| 257 keyframes[0]->setOffset(0.0); | 261 keyframes[0]->setOffset(0.0); |
| 258 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); | 262 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); |
| 259 keyframes[1] = Keyframe::create(); | 263 keyframes[1] = Keyframe::create(); |
| 260 keyframes[1]->setOffset(0.5); | 264 keyframes[1]->setOffset(0.5); |
| 261 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); | 265 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); |
| 262 keyframes[2] = Keyframe::create(); | 266 keyframes[2] = Keyframe::create(); |
| 263 keyframes[2]->setOffset(1.0); | 267 keyframes[2]->setOffset(1.0); |
| 264 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); | 268 keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); |
| 265 | 269 |
| 266 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 270 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 267 expectDoubleValue(3.0, effect->sample(0, 0.0)->at(0)); | 271 expectDoubleValue(3.0, effect->sample(0, 0.0, kDuration)->at(0)); |
| 268 expectDoubleValue(4.0, effect->sample(0, 0.5)->at(0)); | 272 expectDoubleValue(4.0, effect->sample(0, 0.5, kDuration)->at(0)); |
| 269 expectDoubleValue(5.0, effect->sample(0, 1.0)->at(0)); | 273 expectDoubleValue(5.0, effect->sample(0, 1.0, kDuration)->at(0)); |
| 270 } | 274 } |
| 271 | 275 |
| 272 TEST(AnimationKeyframeEffectModel, MultipleKeyframesWithSameOffset) | 276 TEST(AnimationKeyframeEffectModel, MultipleKeyframesWithSameOffset) |
| 273 { | 277 { |
| 274 KeyframeEffectModel::KeyframeVector keyframes(9); | 278 KeyframeEffectModel::KeyframeVector keyframes(9); |
| 275 keyframes[0] = Keyframe::create(); | 279 keyframes[0] = Keyframe::create(); |
| 276 keyframes[0]->setOffset(0.0); | 280 keyframes[0]->setOffset(0.0); |
| 277 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(0.0). get()); | 281 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(0.0). get()); |
| 278 keyframes[1] = Keyframe::create(); | 282 keyframes[1] = Keyframe::create(); |
| 279 keyframes[1]->setOffset(0.1); | 283 keyframes[1]->setOffset(0.1); |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 294 keyframes[6]->setOffset(0.9); | 298 keyframes[6]->setOffset(0.9); |
| 295 keyframes[6]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(6.0). get()); | 299 keyframes[6]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(6.0). get()); |
| 296 keyframes[7] = Keyframe::create(); | 300 keyframes[7] = Keyframe::create(); |
| 297 keyframes[7]->setOffset(0.9); | 301 keyframes[7]->setOffset(0.9); |
| 298 keyframes[7]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0). get()); | 302 keyframes[7]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0). get()); |
| 299 keyframes[8] = Keyframe::create(); | 303 keyframes[8] = Keyframe::create(); |
| 300 keyframes[8]->setOffset(1.0); | 304 keyframes[8]->setOffset(1.0); |
| 301 keyframes[8]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0). get()); | 305 keyframes[8]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0). get()); |
| 302 | 306 |
| 303 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 307 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 304 expectDoubleValue(0.0, effect->sample(0, 0.0)->at(0)); | 308 expectDoubleValue(0.0, effect->sample(0, 0.0, kDuration)->at(0)); |
| 305 expectDoubleValue(2.0, effect->sample(0, 0.2)->at(0)); | 309 expectDoubleValue(2.0, effect->sample(0, 0.2, kDuration)->at(0)); |
| 306 expectDoubleValue(3.0, effect->sample(0, 0.4)->at(0)); | 310 expectDoubleValue(3.0, effect->sample(0, 0.4, kDuration)->at(0)); |
| 307 expectDoubleValue(5.0, effect->sample(0, 0.5)->at(0)); | 311 expectDoubleValue(5.0, effect->sample(0, 0.5, kDuration)->at(0)); |
| 308 expectDoubleValue(5.0, effect->sample(0, 0.6)->at(0)); | 312 expectDoubleValue(5.0, effect->sample(0, 0.6, kDuration)->at(0)); |
| 309 expectDoubleValue(6.0, effect->sample(0, 0.8)->at(0)); | 313 expectDoubleValue(6.0, effect->sample(0, 0.8, kDuration)->at(0)); |
| 310 expectDoubleValue(7.0, effect->sample(0, 1.0)->at(0)); | 314 expectDoubleValue(7.0, effect->sample(0, 1.0, kDuration)->at(0)); |
| 311 } | 315 } |
| 312 | 316 |
| 313 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 317 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 314 TEST(AnimationKeyframeEffectModel, DISABLED_PerKeyframeComposite) | 318 TEST(AnimationKeyframeEffectModel, DISABLED_PerKeyframeComposite) |
| 315 { | 319 { |
| 316 KeyframeEffectModel::KeyframeVector keyframes(2); | 320 KeyframeEffectModel::KeyframeVector keyframes(2); |
| 317 keyframes[0] = Keyframe::create(); | 321 keyframes[0] = Keyframe::create(); |
| 318 keyframes[0]->setOffset(0.0); | 322 keyframes[0]->setOffset(0.0); |
| 319 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(3.0).ge t()); | 323 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(3.0).ge t()); |
| 320 keyframes[1] = Keyframe::create(); | 324 keyframes[1] = Keyframe::create(); |
| 321 keyframes[1]->setOffset(1.0); | 325 keyframes[1]->setOffset(1.0); |
| 322 keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).ge t()); | 326 keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).ge t()); |
| 323 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); | 327 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); |
| 324 | 328 |
| 325 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 329 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 326 expectDoubleValue(3.0 * 0.4 + (7.0 + 5.0) * 0.6, effect->sample(0, 0.6)->at( 0)); | 330 expectDoubleValue(3.0 * 0.4 + (7.0 + 5.0) * 0.6, effect->sample(0, 0.6, kDur ation)->at(0)); |
| 327 } | 331 } |
| 328 | 332 |
| 329 TEST(AnimationKeyframeEffectModel, MultipleProperties) | 333 TEST(AnimationKeyframeEffectModel, MultipleProperties) |
| 330 { | 334 { |
| 331 KeyframeEffectModel::KeyframeVector keyframes(2); | 335 KeyframeEffectModel::KeyframeVector keyframes(2); |
| 332 keyframes[0] = Keyframe::create(); | 336 keyframes[0] = Keyframe::create(); |
| 333 keyframes[0]->setOffset(0.0); | 337 keyframes[0]->setOffset(0.0); |
| 334 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); | 338 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0). get()); |
| 335 keyframes[0]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(4.0) .get()); | 339 keyframes[0]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(4.0) .get()); |
| 336 keyframes[1] = Keyframe::create(); | 340 keyframes[1] = Keyframe::create(); |
| 337 keyframes[1]->setOffset(1.0); | 341 keyframes[1]->setOffset(1.0); |
| 338 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); | 342 keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0). get()); |
| 339 keyframes[1]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(6.0) .get()); | 343 keyframes[1]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(6.0) .get()); |
| 340 | 344 |
| 341 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 345 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 342 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6); | 346 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6, kDur ation); |
| 343 EXPECT_EQ(2UL, values->size()); | 347 EXPECT_EQ(2UL, values->size()); |
| 344 Interpolation* leftValue = findValue(*values.get(), CSSPropertyLeft); | 348 Interpolation* leftValue = findValue(*values.get(), CSSPropertyLeft); |
| 345 ASSERT_TRUE(leftValue); | 349 ASSERT_TRUE(leftValue); |
| 346 expectDoubleValue(5.0, leftValue); | 350 expectDoubleValue(5.0, leftValue); |
| 347 Interpolation* rightValue = findValue(*values.get(), CSSPropertyRight); | 351 Interpolation* rightValue = findValue(*values.get(), CSSPropertyRight); |
| 348 ASSERT_TRUE(rightValue); | 352 ASSERT_TRUE(rightValue); |
| 349 expectDoubleValue(6.0, rightValue); | 353 expectDoubleValue(6.0, rightValue); |
| 350 } | 354 } |
| 351 | 355 |
| 352 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 356 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 353 TEST(AnimationKeyframeEffectModel, DISABLED_RecompositeCompositableValue) | 357 TEST(AnimationKeyframeEffectModel, DISABLED_RecompositeCompositableValue) |
| 354 { | 358 { |
| 355 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); | 359 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(3.0), pixelAnimatableValue(5.0)); |
| 356 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); | 360 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); |
| 357 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); | 361 keyframes[1]->setComposite(AnimationEffect::CompositeAdd); |
| 358 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 362 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 359 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6); | 363 OwnPtr<Vector<RefPtr<Interpolation> > > values = effect->sample(0, 0.6, kDur ation); |
| 360 expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0)); | 364 expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0)); |
| 361 expectDoubleValue((9.0 + 3.0) * 0.4 + (9.0 + 5.0) * 0.6, values->at(0)); | 365 expectDoubleValue((9.0 + 3.0) * 0.4 + (9.0 + 5.0) * 0.6, values->at(0)); |
| 362 } | 366 } |
| 363 | 367 |
| 364 TEST(AnimationKeyframeEffectModel, MultipleIterations) | 368 TEST(AnimationKeyframeEffectModel, MultipleIterations) |
| 365 { | 369 { |
| 366 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(1.0), pixelAnimatableValue(3.0)); | 370 KeyframeEffectModel::KeyframeVector keyframes = keyframesAtZeroAndOne(pixelA nimatableValue(1.0), pixelAnimatableValue(3.0)); |
| 367 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 371 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 368 expectDoubleValue(2.0, effect->sample(0, 0.5)->at(0)); | 372 expectDoubleValue(2.0, effect->sample(0, 0.5, kDuration)->at(0)); |
| 369 expectDoubleValue(2.0, effect->sample(1, 0.5)->at(0)); | 373 expectDoubleValue(2.0, effect->sample(1, 0.5, kDuration)->at(0)); |
| 370 expectDoubleValue(2.0, effect->sample(2, 0.5)->at(0)); | 374 expectDoubleValue(2.0, effect->sample(2, 0.5, kDuration)->at(0)); |
| 371 } | 375 } |
| 372 | 376 |
| 373 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. | 377 // FIXME: Re-enable this test once compositing of CompositeAdd is supported. |
| 374 TEST(AnimationKeyframeEffectModel, DISABLED_DependsOnUnderlyingValue) | 378 TEST(AnimationKeyframeEffectModel, DISABLED_DependsOnUnderlyingValue) |
| 375 { | 379 { |
| 376 KeyframeEffectModel::KeyframeVector keyframes(3); | 380 KeyframeEffectModel::KeyframeVector keyframes(3); |
| 377 keyframes[0] = Keyframe::create(); | 381 keyframes[0] = Keyframe::create(); |
| 378 keyframes[0]->setOffset(0.0); | 382 keyframes[0]->setOffset(0.0); |
| 379 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); | 383 keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); |
| 380 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); | 384 keyframes[0]->setComposite(AnimationEffect::CompositeAdd); |
| 381 keyframes[1] = Keyframe::create(); | 385 keyframes[1] = Keyframe::create(); |
| 382 keyframes[1]->setOffset(0.5); | 386 keyframes[1]->setOffset(0.5); |
| 383 keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); | 387 keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); |
| 384 keyframes[2] = Keyframe::create(); | 388 keyframes[2] = Keyframe::create(); |
| 385 keyframes[2]->setOffset(1.0); | 389 keyframes[2]->setOffset(1.0); |
| 386 keyframes[2]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); | 390 keyframes[2]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).ge t()); |
| 387 | 391 |
| 388 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 392 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| 389 EXPECT_TRUE(effect->sample(0, 0)->at(0)); | 393 EXPECT_TRUE(effect->sample(0, 0, kDuration)->at(0)); |
| 390 EXPECT_TRUE(effect->sample(0, 0.1)->at(0)); | 394 EXPECT_TRUE(effect->sample(0, 0.1, kDuration)->at(0)); |
| 391 EXPECT_TRUE(effect->sample(0, 0.25)->at(0)); | 395 EXPECT_TRUE(effect->sample(0, 0.25, kDuration)->at(0)); |
| 392 EXPECT_TRUE(effect->sample(0, 0.4)->at(0)); | 396 EXPECT_TRUE(effect->sample(0, 0.4, kDuration)->at(0)); |
| 393 EXPECT_FALSE(effect->sample(0, 0.5)->at(0)); | 397 EXPECT_FALSE(effect->sample(0, 0.5, kDuration)->at(0)); |
| 394 EXPECT_FALSE(effect->sample(0, 0.6)->at(0)); | 398 EXPECT_FALSE(effect->sample(0, 0.6, kDuration)->at(0)); |
| 395 EXPECT_FALSE(effect->sample(0, 0.75)->at(0)); | 399 EXPECT_FALSE(effect->sample(0, 0.75, kDuration)->at(0)); |
| 396 EXPECT_FALSE(effect->sample(0, 0.8)->at(0)); | 400 EXPECT_FALSE(effect->sample(0, 0.8, kDuration)->at(0)); |
| 397 EXPECT_FALSE(effect->sample(0, 1)->at(0)); | 401 EXPECT_FALSE(effect->sample(0, 1, kDuration)->at(0)); |
| 398 } | 402 } |
| 399 | 403 |
| 400 TEST(AnimationKeyframeEffectModel, AddSyntheticKeyframes) | 404 TEST(AnimationKeyframeEffectModel, AddSyntheticKeyframes) |
| 401 { | 405 { |
| 402 KeyframeEffectModel::KeyframeVector keyframes(1); | 406 KeyframeEffectModel::KeyframeVector keyframes(1); |
| 403 keyframes[0] = Keyframe::create(); | 407 keyframes[0] = Keyframe::create(); |
| 404 keyframes[0]->setOffset(0.5); | 408 keyframes[0]->setOffset(0.5); |
| 405 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); | 409 keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0). get()); |
| 406 | 410 |
| 407 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); | 411 RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create (keyframes); |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 552 EXPECT_DOUBLE_EQ(0.6, result[5]->offset()); | 556 EXPECT_DOUBLE_EQ(0.6, result[5]->offset()); |
| 553 EXPECT_DOUBLE_EQ(0.7, result[6]->offset()); | 557 EXPECT_DOUBLE_EQ(0.7, result[6]->offset()); |
| 554 EXPECT_DOUBLE_EQ(0.8, result[7]->offset()); | 558 EXPECT_DOUBLE_EQ(0.8, result[7]->offset()); |
| 555 EXPECT_DOUBLE_EQ(0.85, result[8]->offset()); | 559 EXPECT_DOUBLE_EQ(0.85, result[8]->offset()); |
| 556 EXPECT_DOUBLE_EQ(0.9, result[9]->offset()); | 560 EXPECT_DOUBLE_EQ(0.9, result[9]->offset()); |
| 557 EXPECT_DOUBLE_EQ(0.95, result[10]->offset()); | 561 EXPECT_DOUBLE_EQ(0.95, result[10]->offset()); |
| 558 EXPECT_DOUBLE_EQ(1.0, result[11]->offset()); | 562 EXPECT_DOUBLE_EQ(1.0, result[11]->offset()); |
| 559 } | 563 } |
| 560 | 564 |
| 561 } // namespace WebCore | 565 } // namespace WebCore |
| OLD | NEW |