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

Unified Diff: Source/core/css/resolver/ScopedStyleResolver.cpp

Issue 814083003: Update animation when changes in animation keyframes are detected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase + Address comments Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..59074c75a847460b6fb272868ebc9a0d1a3e2466 100644
--- a/Source/core/css/resolver/ScopedStyleResolver.cpp
+++ b/Source/core/css/resolver/ScopedStyleResolver.cpp
@@ -90,14 +90,14 @@ void ScopedStyleResolver::resetAuthorStyle()
m_keyframesRuleMap.clear();
}
-const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const StringImpl* animationName)
+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();
}
@@ -105,8 +105,9 @@ const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const
void ScopedStyleResolver::addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes> rule)
{
AtomicString s(rule->name());
+
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())
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698