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

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

Issue 1394343003: Web Animations: Remove CSS dependence from InterpolationType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_specialCase0and1
Patch Set: NIVs 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
« no previous file with comments | « third_party/WebKit/Source/core/animation/StringKeyframe.cpp ('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 17 matching lines...) Expand all
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/css/resolver/StyleResolver.h" 30 #include "core/css/resolver/StyleResolver.h"
31 31
32 #include "core/CSSPropertyNames.h" 32 #include "core/CSSPropertyNames.h"
33 #include "core/HTMLNames.h" 33 #include "core/HTMLNames.h"
34 #include "core/MediaTypeNames.h" 34 #include "core/MediaTypeNames.h"
35 #include "core/StylePropertyShorthand.h" 35 #include "core/StylePropertyShorthand.h"
36 #include "core/animation/AnimationTimeline.h" 36 #include "core/animation/AnimationTimeline.h"
37 #include "core/animation/ElementAnimations.h" 37 #include "core/animation/ElementAnimations.h"
38 #include "core/animation/InterpolationEnvironment.h"
38 #include "core/animation/InvalidatableStyleInterpolation.h" 39 #include "core/animation/InvalidatableStyleInterpolation.h"
39 #include "core/animation/KeyframeEffect.h" 40 #include "core/animation/KeyframeEffect.h"
40 #include "core/animation/StyleInterpolation.h" 41 #include "core/animation/StyleInterpolation.h"
41 #include "core/animation/animatable/AnimatableValue.h" 42 #include "core/animation/animatable/AnimatableValue.h"
42 #include "core/animation/css/CSSAnimatableValueFactory.h" 43 #include "core/animation/css/CSSAnimatableValueFactory.h"
43 #include "core/animation/css/CSSAnimations.h" 44 #include "core/animation/css/CSSAnimations.h"
44 #include "core/css/CSSCalculationValue.h" 45 #include "core/css/CSSCalculationValue.h"
45 #include "core/css/CSSDefaultStyleSheets.h" 46 #include "core/css/CSSDefaultStyleSheets.h"
46 #include "core/css/CSSFontSelector.h" 47 #include "core/css/CSSFontSelector.h"
47 #include "core/css/CSSKeyframeRule.h" 48 #include "core/css/CSSKeyframeRule.h"
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act iveInterpolationsMap& activeInterpolationsMap) 961 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act iveInterpolationsMap& activeInterpolationsMap)
961 { 962 {
962 for (const auto& interpolationsVectorEntry : activeInterpolationsMap) { 963 for (const auto& interpolationsVectorEntry : activeInterpolationsMap) {
963 if (!interpolationsVectorEntry.key.isCSSProperty()) 964 if (!interpolationsVectorEntry.key.isCSSProperty())
964 continue; 965 continue;
965 CSSPropertyID property = interpolationsVectorEntry.key.cssProperty(); 966 CSSPropertyID property = interpolationsVectorEntry.key.cssProperty();
966 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) 967 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
967 continue; 968 continue;
968 const Interpolation& interpolation = *interpolationsVectorEntry.value.fi rst(); 969 const Interpolation& interpolation = *interpolationsVectorEntry.value.fi rst();
969 if (interpolation.isInvalidatableStyleInterpolation()) { 970 if (interpolation.isInvalidatableStyleInterpolation()) {
970 InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntr y.value, state); 971 InterpolationEnvironment environment(state);
972 InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntr y.value, environment);
971 } else { 973 } else {
972 // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes. 974 // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
973 toStyleInterpolation(interpolation).apply(state); 975 toStyleInterpolation(interpolation).apply(state);
974 } 976 }
975 } 977 }
976 } 978 }
977 979
978 static inline bool isValidCueStyleProperty(CSSPropertyID id) 980 static inline bool isValidCueStyleProperty(CSSPropertyID id)
979 { 981 {
980 switch (id) { 982 switch (id) {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 visitor->trace(m_watchedSelectorsRules); 1492 visitor->trace(m_watchedSelectorsRules);
1491 visitor->trace(m_treeBoundaryCrossingRules); 1493 visitor->trace(m_treeBoundaryCrossingRules);
1492 visitor->trace(m_styleResourceLoader); 1494 visitor->trace(m_styleResourceLoader);
1493 visitor->trace(m_styleSharingLists); 1495 visitor->trace(m_styleSharingLists);
1494 visitor->trace(m_pendingStyleSheets); 1496 visitor->trace(m_pendingStyleSheets);
1495 visitor->trace(m_document); 1497 visitor->trace(m_document);
1496 #endif 1498 #endif
1497 } 1499 }
1498 1500
1499 } // namespace blink 1501 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/StringKeyframe.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698