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

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

Issue 23264017: Implement support for unprefixed keyframes rules resolution. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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/CSSParser-in.cpp ('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 23f84234d924a71a3d85b168abef371d640d784e..261d45818bf572f1b9e2a3d52c0fb20d4156c60a 100644
--- a/Source/core/css/resolver/ScopedStyleResolver.cpp
+++ b/Source/core/css/resolver/ScopedStyleResolver.cpp
@@ -335,7 +335,15 @@ const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const
void ScopedStyleResolver::addKeyframeStyle(PassRefPtr<StyleRuleKeyframes> rule)
{
AtomicString s(rule->name());
- m_keyframesRuleMap.set(s.impl(), rule);
+ if (rule->isVendorPrefixed()) {
+ KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(rule->name().impl());
+ if (it == m_keyframesRuleMap.end())
+ m_keyframesRuleMap.set(s.impl(), rule);
+ else if (it->value->isVendorPrefixed())
+ m_keyframesRuleMap.set(s.impl(), rule);
+ } else {
+ m_keyframesRuleMap.set(s.impl(), rule);
+ }
}
inline RuleSet* ScopedStyleResolver::atHostRuleSetFor(const ShadowRoot* shadowRoot) const
« no previous file with comments | « Source/core/css/CSSParser-in.cpp ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698