| 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 RefPtr<AnimatableTransform> value = | 235 RefPtr<AnimatableTransform> value = |
| 236 AnimatableTransform::Create(values[i], 1); | 236 AnimatableTransform::Create(values[i], 1); |
| 237 frames->push_back( | 237 frames->push_back( |
| 238 CreateReplaceOpKeyframe(CSSPropertyTransform, value.Get(), offset) | 238 CreateReplaceOpKeyframe(CSSPropertyTransform, value.Get(), offset) |
| 239 .Get()); | 239 .Get()); |
| 240 } | 240 } |
| 241 return frames; | 241 return frames; |
| 242 } | 242 } |
| 243 | 243 |
| 244 AnimatableValueKeyframeEffectModel* CreateKeyframeEffectModel( | 244 AnimatableValueKeyframeEffectModel* CreateKeyframeEffectModel( |
| 245 PassRefPtr<AnimatableValueKeyframe> prp_from, | 245 RefPtr<AnimatableValueKeyframe> from, |
| 246 PassRefPtr<AnimatableValueKeyframe> prp_to, | 246 RefPtr<AnimatableValueKeyframe> to, |
| 247 PassRefPtr<AnimatableValueKeyframe> prp_c = nullptr, | 247 RefPtr<AnimatableValueKeyframe> c = nullptr, |
| 248 PassRefPtr<AnimatableValueKeyframe> prp_d = nullptr) { | 248 RefPtr<AnimatableValueKeyframe> d = nullptr) { |
| 249 RefPtr<AnimatableValueKeyframe> from = prp_from; | |
| 250 RefPtr<AnimatableValueKeyframe> to = prp_to; | |
| 251 RefPtr<AnimatableValueKeyframe> c = prp_c; | |
| 252 RefPtr<AnimatableValueKeyframe> d = prp_d; | |
| 253 | |
| 254 EXPECT_EQ(from->Offset(), 0); | 249 EXPECT_EQ(from->Offset(), 0); |
| 255 AnimatableValueKeyframeVector frames; | 250 AnimatableValueKeyframeVector frames; |
| 256 frames.push_back(from); | 251 frames.push_back(from); |
| 257 EXPECT_LE(from->Offset(), to->Offset()); | 252 EXPECT_LE(from->Offset(), to->Offset()); |
| 258 frames.push_back(to); | 253 frames.push_back(to); |
| 259 if (c) { | 254 if (c) { |
| 260 EXPECT_LE(to->Offset(), c->Offset()); | 255 EXPECT_LE(to->Offset(), c->Offset()); |
| 261 frames.push_back(c); | 256 frames.push_back(c); |
| 262 } | 257 } |
| 263 if (d) { | 258 if (d) { |
| (...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 | 1319 |
| 1325 // Clearing the effect node entirely should also produce false. | 1320 // Clearing the effect node entirely should also produce false. |
| 1326 properties.ClearEffect(); | 1321 properties.ClearEffect(); |
| 1327 EXPECT_FALSE(CompositorAnimations::CanStartAnimationOnCompositor(*element)); | 1322 EXPECT_FALSE(CompositorAnimations::CanStartAnimationOnCompositor(*element)); |
| 1328 | 1323 |
| 1329 element->SetLayoutObject(nullptr); | 1324 element->SetLayoutObject(nullptr); |
| 1330 LayoutObjectProxy::Dispose(layout_object); | 1325 LayoutObjectProxy::Dispose(layout_object); |
| 1331 } | 1326 } |
| 1332 | 1327 |
| 1333 } // namespace blink | 1328 } // namespace blink |
| OLD | NEW |