Chromium Code Reviews| Index: Source/core/css/resolver/ScopedStyleResolver.cpp |
| diff --git a/Source/core/css/resolver/ScopedStyleResolver.cpp b/Source/core/css/resolver/ScopedStyleResolver.cpp |
| index 31fe576402f70a2c084cd9095d70bd5bbe9076e3..67d14773647e6edef5f541130cbe3573831ddec6 100644 |
| --- a/Source/core/css/resolver/ScopedStyleResolver.cpp |
| +++ b/Source/core/css/resolver/ScopedStyleResolver.cpp |
| @@ -90,23 +90,26 @@ void ScopedStyleResolver::resetAuthorStyle() |
| m_keyframesRuleMap.clear(); |
| } |
| -const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const StringImpl* animationName) |
| +PassRefPtrWillBeRawPtr<StyleRuleKeyframes> ScopedStyleResolver::keyframeStylesForAnimation(const StringImpl* animationName) |
| { |
| if (m_keyframesRuleMap.isEmpty()) |
| - return 0; |
| + return nullptr; |
| KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName); |
| if (it == m_keyframesRuleMap.end()) |
| - return 0; |
| + return nullptr; |
| - return it->value.get(); |
| + return it->value; |
| } |
| void ScopedStyleResolver::addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes> rule) |
| { |
| AtomicString s(rule->name()); |
| + |
| + rule->styleChanged(); |
|
esprehn
2015/01/29 04:23:19
I don't think you need this. This is just filling
shend
2015/01/30 00:03:10
Done.
|
| + |
| if (rule->isVendorPrefixed()) { |
| - KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(rule->name().impl()); |
| + KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(s.impl()); |
| if (it == m_keyframesRuleMap.end()) |
| m_keyframesRuleMap.set(s.impl(), rule); |
| else if (it->value->isVendorPrefixed()) |