Simplify ScopedStyleResolver keyframe handling.

sky/engine/core/css/resolver/ScopedStyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
     const RuleSet& ruleSet = sheet->ensureRuleSet(addRuleFlags);
     resolver->addMediaQueryResults(ruleSet.viewportDependentMediaQueryResults());
     resolver->processScopedRules(ruleSet, cssSheet, index, treeScope().rootNode());
 
     m_features.add(ruleSet.features());
 }
 
 void ScopedStyleResolver::resetAuthorStyle()
 {
     m_authorStyleSheets.clear();
-    m_keyframesRuleMap.clear();
     m_features.clear();
 }
 
-const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(const StringImpl* animationName)
+const StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(String animationName)
 {
-    if (m_keyframesRuleMap.isEmpty())
-        return 0;
-
-    KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName);
-    if (it == m_keyframesRuleMap.end())
-        return 0;
-
-    return it->value.get();
-}
-
-void ScopedStyleResolver::addKeyframeStyle(PassRefPtr<StyleRuleKeyframes> rule)
-{
-    AtomicString s(rule->name());
-    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);
+    for (auto& sheet : m_authorStyleSheets) {
+        // TODO(esprehn): Maybe just store the keyframes in a map?
+        for (auto& rule : sheet->contents()->ruleSet().keyframesRules()) {
+            if (rule->name() == animationName)
+                return rule.get();
+        }
     }
+    return nullptr;
 }
 
 void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, bool applyAuthorStyles, CascadeScope cascadeScope, CascadeOrder cascadeOrder)
 {
     unsigned contextFlags = SelectorChecker::DefaultBehavior;
 
     if (!applyAuthorStyles)
         contextFlags |= SelectorChecker::ScopeContainsLastMatchedElement;
 
     RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
         MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], applyAuthorStyles, i);
         collector.collectMatchingRules(matchRequest, ruleRange, static_cast<SelectorChecker::ContextFlags>(contextFlags), cascadeScope, cascadeOrder);
     }
 }
 
 } // namespace blink