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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 1149383003: Fix -webkit-* pseudo cannot match CSS animation name Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 return true; 985 return true;
986 } 986 }
987 987
988 StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con st AtomicString& animationName) 988 StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con st AtomicString& animationName)
989 { 989 {
990 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers; 990 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers;
991 collectScopedResolversForHostedShadowTrees(element, resolvers); 991 collectScopedResolversForHostedShadowTrees(element, resolvers);
992 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver()) 992 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver())
993 resolvers.append(scopedResolver); 993 resolvers.append(scopedResolver);
994 994
995 if (element->isInShadowTree() && toShadowRoot(element->treeScope().rootNode( )).type() == ShadowRoot::UserAgentShadowRoot)
996 resolvers.append(element->document().scopedStyleResolver());
997
995 for (size_t i = 0; i < resolvers.size(); ++i) { 998 for (size_t i = 0; i < resolvers.size(); ++i) {
996 if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA nimation(animationName.impl())) 999 if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA nimation(animationName.impl()))
997 return keyframesRule; 1000 return keyframesRule;
998 } 1001 }
999 return nullptr; 1002 return nullptr;
1000 } 1003 }
1001 1004
1002 template <CSSPropertyPriority priority> 1005 template <CSSPropertyPriority priority>
1003 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>& activeInterpo lations) 1006 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>& activeInterpo lations)
1004 { 1007 {
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 visitor->trace(m_watchedSelectorsRules); 1502 visitor->trace(m_watchedSelectorsRules);
1500 visitor->trace(m_treeBoundaryCrossingRules); 1503 visitor->trace(m_treeBoundaryCrossingRules);
1501 visitor->trace(m_styleResourceLoader); 1504 visitor->trace(m_styleResourceLoader);
1502 visitor->trace(m_styleSharingLists); 1505 visitor->trace(m_styleSharingLists);
1503 visitor->trace(m_pendingStyleSheets); 1506 visitor->trace(m_pendingStyleSheets);
1504 visitor->trace(m_document); 1507 visitor->trace(m_document);
1505 #endif 1508 #endif
1506 } 1509 }
1507 1510
1508 } // namespace blink 1511 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698