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

Side by Side Diff: sky/engine/core/animation/ActiveAnimations.cpp

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: CompositorPendingAnimations -> PendingAnimations Created 6 years 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
« no previous file with comments | « sky/engine/core/animation/ActiveAnimations.h ('k') | sky/engine/core/animation/Animation.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
35 35
36 namespace blink { 36 namespace blink {
37 37
38 ActiveAnimations::~ActiveAnimations() 38 ActiveAnimations::~ActiveAnimations()
39 { 39 {
40 for (size_t i = 0; i < m_animations.size(); ++i) 40 for (size_t i = 0; i < m_animations.size(); ++i)
41 m_animations[i]->notifyElementDestroyed(); 41 m_animations[i]->notifyElementDestroyed();
42 m_animations.clear(); 42 m_animations.clear();
43 } 43 }
44 44
45 void ActiveAnimations::updateAnimationFlags(RenderStyle& style)
46 {
47 for (AnimationPlayerCountedSet::const_iterator it = m_players.begin(); it != m_players.end(); ++it) {
48 const AnimationPlayer& player = *it->key;
49 ASSERT(player.source());
50 // FIXME: Needs to consider AnimationGroup once added.
51 ASSERT(player.source()->isAnimation());
52 const Animation& animation = *toAnimation(player.source());
53 if (animation.isCurrent()) {
54 if (animation.affects(CSSPropertyOpacity))
55 style.setHasCurrentOpacityAnimation(true);
56 if (animation.affects(CSSPropertyTransform))
57 style.setHasCurrentTransformAnimation(true);
58 if (animation.affects(CSSPropertyWebkitFilter))
59 style.setHasCurrentFilterAnimation(true);
60 }
61 }
62
63 if (style.hasCurrentOpacityAnimation())
64 style.setIsRunningOpacityAnimationOnCompositor(m_defaultStack.hasActiveA nimationsOnCompositor(CSSPropertyOpacity));
65 if (style.hasCurrentTransformAnimation())
66 style.setIsRunningTransformAnimationOnCompositor(m_defaultStack.hasActiv eAnimationsOnCompositor(CSSPropertyTransform));
67 if (style.hasCurrentFilterAnimation())
68 style.setIsRunningFilterAnimationOnCompositor(m_defaultStack.hasActiveAn imationsOnCompositor(CSSPropertyWebkitFilter));
69 }
70
71 void ActiveAnimations::cancelAnimationOnCompositor()
72 {
73 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla yers.end(); ++it)
74 it->key->cancelAnimationOnCompositor();
75 }
76
77 } // namespace blink 45 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/animation/ActiveAnimations.h ('k') | sky/engine/core/animation/Animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698