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

Side by Side Diff: Source/core/css/resolver/StyleResolver.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, 10 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
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | 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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rTransitions); 1008 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rTransitions);
1009 1009
1010 // Start loading resources used by animations. 1010 // Start loading resources used by animations.
1011 loadPendingResources(state); 1011 loadPendingResources(state);
1012 1012
1013 ASSERT(!state.fontBuilder().fontDirty()); 1013 ASSERT(!state.fontBuilder().fontDirty());
1014 1014
1015 return true; 1015 return true;
1016 } 1016 }
1017 1017
1018 const StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* elemen t, const AtomicString& animationName) 1018 StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con st AtomicString& animationName)
1019 { 1019 {
1020 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers; 1020 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers;
1021 collectScopedResolversForHostedShadowTrees(element, resolvers); 1021 collectScopedResolversForHostedShadowTrees(element, resolvers);
1022 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver()) 1022 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver())
1023 resolvers.append(scopedResolver); 1023 resolvers.append(scopedResolver);
1024 1024
1025 for (size_t i = 0; i < resolvers.size(); ++i) { 1025 for (size_t i = 0; i < resolvers.size(); ++i) {
1026 if (const StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStyl esForAnimation(animationName.impl())) 1026 if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA nimation(animationName.impl()))
1027 return keyframesRule; 1027 return keyframesRule;
1028 } 1028 }
1029 return nullptr; 1029 return nullptr;
1030 } 1030 }
1031 1031
1032 template <StyleResolver::StyleApplicationPass pass> 1032 template <StyleResolver::StyleApplicationPass pass>
1033 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpo lations) 1033 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpo lations)
1034 { 1034 {
1035 for (const auto& interpolationEntry : activeInterpolations) { 1035 for (const auto& interpolationEntry : activeInterpolations) {
1036 CSSPropertyID property = interpolationEntry.key; 1036 CSSPropertyID property = interpolationEntry.key;
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 visitor->trace(m_uncommonAttributeRuleSet); 1573 visitor->trace(m_uncommonAttributeRuleSet);
1574 visitor->trace(m_watchedSelectorsRules); 1574 visitor->trace(m_watchedSelectorsRules);
1575 visitor->trace(m_treeBoundaryCrossingRules); 1575 visitor->trace(m_treeBoundaryCrossingRules);
1576 visitor->trace(m_styleSharingLists); 1576 visitor->trace(m_styleSharingLists);
1577 visitor->trace(m_pendingStyleSheets); 1577 visitor->trace(m_pendingStyleSheets);
1578 visitor->trace(m_document); 1578 visitor->trace(m_document);
1579 #endif 1579 #endif
1580 } 1580 }
1581 1581
1582 } // namespace blink 1582 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698