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 12 matching lines...) Expand all Loading... |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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" | |
34 | |
35 namespace blink { | 33 namespace blink { |
36 | 34 |
37 ElementAnimations::ElementAnimations() | 35 ElementAnimations::ElementAnimations() |
38 : m_animationStyleChange(false) | 36 : m_animationStyleChange(false) |
39 { | 37 { |
40 } | 38 } |
41 | 39 |
42 ElementAnimations::~ElementAnimations() | 40 ElementAnimations::~ElementAnimations() |
43 { | 41 { |
44 } | 42 } |
(...skipping 77 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 | 120 // 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 | 121 // 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 | 122 // 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 | 123 // 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 | 124 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com
parison ASSERT |
127 // in updateBaseComputedStyle. | 125 // in updateBaseComputedStyle. |
128 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl
e->font().isFallbackValid()); | 126 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl
e->font().isFallbackValid()); |
129 } | 127 } |
130 | 128 |
131 } // namespace blink | 129 } // namespace blink |
OLD | NEW |