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

Unified Diff: Source/core/rendering/RenderLayerBacking.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, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.h ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerBacking.cpp
diff --git a/Source/core/rendering/RenderLayerBacking.cpp b/Source/core/rendering/RenderLayerBacking.cpp
index dbc65c5142ba5da95d4228d074dd049c95d6de4a..eb5fc8120826997def8c0ce38dbc7d051a3017e3 100644
--- a/Source/core/rendering/RenderLayerBacking.cpp
+++ b/Source/core/rendering/RenderLayerBacking.cpp
@@ -1734,7 +1734,7 @@ void RenderLayerBacking::verifyNotPainting()
}
#endif
-bool RenderLayerBacking::startAnimation(double timeOffset, const Animation* anim, const KeyframeList& keyframes)
+bool RenderLayerBacking::startAnimation(double timeOffset, const CSSAnimationData* anim, const KeyframeList& keyframes)
{
bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
bool hasTransform = renderer()->isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
@@ -1805,7 +1805,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
ASSERT(property != CSSPropertyInvalid);
if (property == CSSPropertyOpacity) {
- const Animation* opacityAnim = toStyle->transitionForProperty(CSSPropertyOpacity);
+ const CSSAnimationData* opacityAnim = toStyle->transitionForProperty(CSSPropertyOpacity);
if (opacityAnim && !opacityAnim->isEmptyOrZeroDuration()) {
KeyframeValueList opacityVector(AnimatedPropertyOpacity);
opacityVector.insert(new FloatAnimationValue(0, compositingOpacity(fromStyle->opacity())));
@@ -1820,7 +1820,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
}
if (property == CSSPropertyWebkitTransform && m_owningLayer->hasTransform()) {
- const Animation* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
+ const CSSAnimationData* transformAnim = toStyle->transitionForProperty(CSSPropertyWebkitTransform);
if (transformAnim && !transformAnim->isEmptyOrZeroDuration()) {
KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
transformVector.insert(new TransformAnimationValue(0, &fromStyle->transform()));
@@ -1834,7 +1834,7 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
}
if (property == CSSPropertyWebkitFilter && m_owningLayer->hasFilter()) {
- const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
+ const CSSAnimationData* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
filterVector.insert(new FilterAnimationValue(0, &fromStyle->filter()));
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.h ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698