Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: Source/core/page/animation/ImplicitAnimation.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update to long paths Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 21 matching lines...) Expand all
32 #include "core/page/animation/AnimationControllerPrivate.h" 32 #include "core/page/animation/AnimationControllerPrivate.h"
33 #include "core/page/animation/CSSPropertyAnimation.h" 33 #include "core/page/animation/CSSPropertyAnimation.h"
34 #include "core/page/animation/CompositeAnimation.h" 34 #include "core/page/animation/CompositeAnimation.h"
35 #include "core/page/animation/ImplicitAnimation.h" 35 #include "core/page/animation/ImplicitAnimation.h"
36 #include "core/page/animation/KeyframeAnimation.h" 36 #include "core/page/animation/KeyframeAnimation.h"
37 #include "core/rendering/RenderBoxModelObject.h" 37 #include "core/rendering/RenderBoxModelObject.h"
38 #include <wtf/UnusedParam.h> 38 #include <wtf/UnusedParam.h>
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 ImplicitAnimation::ImplicitAnimation(const Animation* transition, CSSPropertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderS tyle* fromStyle) 42 ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp ertyID animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderStyle* fromStyle)
43 : AnimationBase(transition, renderer, compAnim) 43 : AnimationBase(transition, renderer, compAnim)
44 , m_transitionProperty(transition->property()) 44 , m_transitionProperty(transition->property())
45 , m_animatingProperty(animatingProperty) 45 , m_animatingProperty(animatingProperty)
46 , m_overridden(false) 46 , m_overridden(false)
47 , m_active(true) 47 , m_active(true)
48 , m_fromStyle(fromStyle) 48 , m_fromStyle(fromStyle)
49 { 49 {
50 ASSERT(animatingProperty != CSSPropertyInvalid); 50 ASSERT(animatingProperty != CSSPropertyInvalid);
51 } 51 }
52 52
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // only need service at the end of the transition. 280 // only need service at the end of the transition.
281 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper ty) && isAccelerated()) { 281 if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProper ty) && isAccelerated()) {
282 bool isLooping; 282 bool isLooping;
283 getTimeToNextEvent(t, isLooping); 283 getTimeToNextEvent(t, isLooping);
284 } 284 }
285 285
286 return t; 286 return t;
287 } 287 }
288 288
289 } // namespace WebCore 289 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/animation/ImplicitAnimation.h ('k') | Source/core/page/animation/KeyframeAnimation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698