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

Side by Side Diff: Source/core/animation/ActiveAnimations.cpp

Issue 98663004: Add support for unprefixed CSS Transforms (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 6 years, 9 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 | Annotate | Revision Log
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 25 matching lines...) Expand all
36 namespace WebCore { 36 namespace WebCore {
37 37
38 bool shouldCompositeForActiveAnimations(const RenderObject& renderer) 38 bool shouldCompositeForActiveAnimations(const RenderObject& renderer)
39 { 39 {
40 if (!renderer.node() || !renderer.node()->isElementNode()) 40 if (!renderer.node() || !renderer.node()->isElementNode())
41 return false; 41 return false;
42 42
43 const Element* element = toElement(renderer.node()); 43 const Element* element = toElement(renderer.node());
44 if (const ActiveAnimations* activeAnimations = element->activeAnimations()) { 44 if (const ActiveAnimations* activeAnimations = element->activeAnimations()) {
45 if (activeAnimations->hasActiveAnimations(CSSPropertyOpacity) 45 if (activeAnimations->hasActiveAnimations(CSSPropertyOpacity)
46 || activeAnimations->hasActiveAnimations(CSSPropertyWebkitTransform) 46 || activeAnimations->hasActiveAnimations(CSSPropertyTransform)
eseidel 2014/03/20 16:40:57 I see Transform, but not WebKitTransform here, is
dstockwell 2014/03/24 21:40:56 Yes, in the animation system we only want to anima
47 || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter)) 47 || activeAnimations->hasActiveAnimations(CSSPropertyWebkitFilter))
48 return true; 48 return true;
49 } 49 }
50 50
51 return false; 51 return false;
52 } 52 }
53 53
54 bool hasActiveAnimations(const RenderObject& renderer, CSSPropertyID property) 54 bool hasActiveAnimations(const RenderObject& renderer, CSSPropertyID property)
55 { 55 {
56 if (!renderer.node() || !renderer.node()->isElementNode()) 56 if (!renderer.node() || !renderer.node()->isElementNode())
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return m_defaultStack.hasActiveAnimationsOnCompositor(property); 94 return m_defaultStack.hasActiveAnimationsOnCompositor(property);
95 } 95 }
96 96
97 void ActiveAnimations::cancelAnimationOnCompositor() 97 void ActiveAnimations::cancelAnimationOnCompositor()
98 { 98 {
99 for (AnimationPlayerSet::iterator it = m_players.begin(); it != players().en d(); ++it) 99 for (AnimationPlayerSet::iterator it = m_players.begin(); it != players().en d(); ++it)
100 it->key->cancelAnimationOnCompositor(); 100 it->key->cancelAnimationOnCompositor();
101 } 101 }
102 102
103 } // namespace WebCore 103 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698