| Index: third_party/WebKit/Source/core/animation/ElementAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
|
| index 228a67eb040fd5e16918f642a73dc6ae7d8c0ff2..baac68c92ec8479e5b605ba41b71fbbfcdb520e4 100644
|
| --- a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
|
| @@ -111,12 +111,13 @@ void ElementAnimations::clearBaseComputedStyle() {
|
| }
|
|
|
| bool ElementAnimations::isAnimationStyleChange() const {
|
| - // TODO(rune@opera.com): The FontFaceCache version number may be increased without forcing
|
| - // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache
|
| - // versions will not be considered equal as Font::operator== will compare versions, hence
|
| - // ComputedStyle::operator== will return false. We avoid using baseComputedStyle (the check for
|
| - // isFallbackValid()) in that case to avoid triggering the ComputedStyle comparison ASSERT
|
| - // in updateBaseComputedStyle.
|
| + // TODO(rune@opera.com): The FontFaceCache version number may be increased
|
| + // without forcing a style recalc (see crbug.com/471079). ComputedStyle
|
| + // objects created with different cache versions will not be considered equal
|
| + // as Font::operator== will compare versions, hence ComputedStyle::operator==
|
| + // will return false. We avoid using baseComputedStyle (the check for
|
| + // isFallbackValid()) in that case to avoid triggering the ComputedStyle
|
| + // comparison ASSERT in updateBaseComputedStyle.
|
| return m_animationStyleChange &&
|
| (!m_baseComputedStyle ||
|
| m_baseComputedStyle->font().isFallbackValid());
|
|
|