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

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

Issue 1412423004: Web Animations: Move property handle filtering into AnimationStack building (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_svgAdditiveApplication
Patch Set: Rebased Created 5 years, 1 month 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
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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 for (size_t i = 0; i < resolvers.size(); ++i) { 953 for (size_t i = 0; i < resolvers.size(); ++i) {
954 if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA nimation(animationName.impl())) 954 if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA nimation(animationName.impl()))
955 return keyframesRule; 955 return keyframesRule;
956 } 956 }
957 return nullptr; 957 return nullptr;
958 } 958 }
959 959
960 template <CSSPropertyPriority priority> 960 template <CSSPropertyPriority priority>
961 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act iveInterpolationsMap& activeInterpolationsMap) 961 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act iveInterpolationsMap& activeInterpolationsMap)
962 { 962 {
963 for (const auto& interpolationsVectorEntry : activeInterpolationsMap) { 963 for (const auto& entry : activeInterpolationsMap) {
964 if (!interpolationsVectorEntry.key.isCSSProperty()) 964 CSSPropertyID property = entry.key.cssProperty();
965 continue;
966 CSSPropertyID property = interpolationsVectorEntry.key.cssProperty();
967 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) 965 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
968 continue; 966 continue;
969 const Interpolation& interpolation = *interpolationsVectorEntry.value.fi rst(); 967 const Interpolation& interpolation = *entry.value.first();
970 if (interpolation.isInvalidatableInterpolation()) { 968 if (interpolation.isInvalidatableInterpolation()) {
971 InterpolationEnvironment environment(state); 969 InterpolationEnvironment environment(state);
972 InvalidatableInterpolation::applyStack(interpolationsVectorEntry.val ue, environment); 970 InvalidatableInterpolation::applyStack(entry.value, environment);
973 } else { 971 } else {
974 // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes. 972 // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
975 toStyleInterpolation(interpolation).apply(state); 973 toStyleInterpolation(interpolation).apply(state);
976 } 974 }
977 } 975 }
978 } 976 }
979 977
980 static inline bool isValidCueStyleProperty(CSSPropertyID id) 978 static inline bool isValidCueStyleProperty(CSSPropertyID id)
981 { 979 {
982 switch (id) { 980 switch (id) {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 visitor->trace(m_watchedSelectorsRules); 1490 visitor->trace(m_watchedSelectorsRules);
1493 visitor->trace(m_treeBoundaryCrossingRules); 1491 visitor->trace(m_treeBoundaryCrossingRules);
1494 visitor->trace(m_styleResourceLoader); 1492 visitor->trace(m_styleResourceLoader);
1495 visitor->trace(m_styleSharingLists); 1493 visitor->trace(m_styleSharingLists);
1496 visitor->trace(m_pendingStyleSheets); 1494 visitor->trace(m_pendingStyleSheets);
1497 visitor->trace(m_document); 1495 visitor->trace(m_document);
1498 #endif 1496 #endif
1499 } 1497 }
1500 1498
1501 } // namespace blink 1499 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698