OLD | NEW |
---|---|
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 16 matching lines...) Expand all Loading... | |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
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 "core/animation/ElementAnimations.h" | 31 #include "core/animation/ElementAnimations.h" |
32 | 32 |
33 #include "core/layout/LayoutObject.h" | 33 #include "core/layout/LayoutObject.h" |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 static CompositorElementId s_nextCompositorElementId = 1; | |
esprehn
2016/05/10 22:46:57
You should use DOMNodeIds, why can't you allocate
loyso (OOO)
2016/05/12 05:55:39
Not every Compositor Animation subsystem has assoc
| |
38 | |
37 ElementAnimations::ElementAnimations() | 39 ElementAnimations::ElementAnimations() |
38 : m_animationStyleChange(false) | 40 : m_compositorElementId(s_nextCompositorElementId++) |
41 , m_animationStyleChange(false) | |
39 { | 42 { |
40 } | 43 } |
41 | 44 |
42 ElementAnimations::~ElementAnimations() | 45 ElementAnimations::~ElementAnimations() |
43 { | 46 { |
44 } | 47 } |
45 | 48 |
46 void ElementAnimations::updateAnimationFlags(ComputedStyle& style) | 49 void ElementAnimations::updateAnimationFlags(ComputedStyle& style) |
47 { | 50 { |
48 for (const auto& entry : m_animations) { | 51 for (const auto& entry : m_animations) { |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
122 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing | 125 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing |
123 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache | 126 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache |
124 // versions will not be considered equal as Font::operator== will compare ve rsions, hence | 127 // versions will not be considered equal as Font::operator== will compare ve rsions, hence |
125 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for | 128 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for |
126 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT | 129 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT |
127 // in updateBaseComputedStyle. | 130 // in updateBaseComputedStyle. |
128 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid()); | 131 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid()); |
129 } | 132 } |
130 | 133 |
131 } // namespace blink | 134 } // namespace blink |
OLD | NEW |