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

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

Issue 635203003: Skip rule matching during animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Moved baseRenderStyle handling into ActiveAnimations Created 6 years, 2 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
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/css/resolver/StyleResolver.cpp » ('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 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/ActiveAnimations.h" 32 #include "core/animation/ActiveAnimations.h"
33 33
34 #include "core/rendering/RenderObject.h" 34 #include "core/rendering/RenderObject.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 ActiveAnimations::ActiveAnimations()
39 : m_animationStyleChange(false)
40 {
41 }
42
38 ActiveAnimations::~ActiveAnimations() 43 ActiveAnimations::~ActiveAnimations()
39 { 44 {
40 #if !ENABLE(OILPAN) 45 #if !ENABLE(OILPAN)
41 for (size_t i = 0; i < m_animations.size(); ++i) 46 for (size_t i = 0; i < m_animations.size(); ++i)
42 m_animations[i]->notifyElementDestroyed(); 47 m_animations[i]->notifyElementDestroyed();
43 m_animations.clear(); 48 m_animations.clear();
44 #endif 49 #endif
45 } 50 }
46 51
47 void ActiveAnimations::updateAnimationFlags(RenderStyle& style) 52 void ActiveAnimations::updateAnimationFlags(RenderStyle& style)
(...skipping 30 matching lines...) Expand all
78 83
79 void ActiveAnimations::trace(Visitor* visitor) 84 void ActiveAnimations::trace(Visitor* visitor)
80 { 85 {
81 #if ENABLE(OILPAN) 86 #if ENABLE(OILPAN)
82 visitor->trace(m_cssAnimations); 87 visitor->trace(m_cssAnimations);
83 visitor->trace(m_defaultStack); 88 visitor->trace(m_defaultStack);
84 visitor->trace(m_players); 89 visitor->trace(m_players);
85 #endif 90 #endif
86 } 91 }
87 92
93 const RenderStyle* ActiveAnimations::baseRenderStyle() const
94 {
95 #if !ENABLE(ASSERT)
96 if (isAnimationStyleChange())
97 return m_baseRenderStyle.get();
98 #endif
99 return nullptr;
100 }
101
102 void ActiveAnimations::updateBaseRenderStyle(const RenderStyle* renderStyle)
103 {
104 if (!isAnimationStyleChange()) {
105 m_baseRenderStyle = nullptr;
106 return;
107 }
108 #if ENABLE(ASSERT)
109 if (m_baseRenderStyle && renderStyle)
110 ASSERT(*m_baseRenderStyle == *renderStyle);
111 #endif
112 m_baseRenderStyle = RenderStyle::clone(renderStyle);
113 }
114
88 } // namespace blink 115 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698