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

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

Issue 2680923005: Refactor CSS Transitions to use CSSInterpolationTypes instead of AnimatableValues (Closed)
Patch Set: lint Created 3 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
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. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 22 matching lines...) Expand all
33 #include "core/CSSPropertyNames.h" 33 #include "core/CSSPropertyNames.h"
34 #include "core/HTMLNames.h" 34 #include "core/HTMLNames.h"
35 #include "core/MediaTypeNames.h" 35 #include "core/MediaTypeNames.h"
36 #include "core/StylePropertyShorthand.h" 36 #include "core/StylePropertyShorthand.h"
37 #include "core/animation/AnimationTimeline.h" 37 #include "core/animation/AnimationTimeline.h"
38 #include "core/animation/CSSInterpolationTypesMap.h" 38 #include "core/animation/CSSInterpolationTypesMap.h"
39 #include "core/animation/ElementAnimations.h" 39 #include "core/animation/ElementAnimations.h"
40 #include "core/animation/InterpolationEnvironment.h" 40 #include "core/animation/InterpolationEnvironment.h"
41 #include "core/animation/InvalidatableInterpolation.h" 41 #include "core/animation/InvalidatableInterpolation.h"
42 #include "core/animation/KeyframeEffect.h" 42 #include "core/animation/KeyframeEffect.h"
43 #include "core/animation/LegacyStyleInterpolation.h" 43 #include "core/animation/TransitionInterpolation.h"
44 #include "core/animation/animatable/AnimatableValue.h" 44 #include "core/animation/animatable/AnimatableValue.h"
45 #include "core/animation/css/CSSAnimatableValueFactory.h" 45 #include "core/animation/css/CSSAnimatableValueFactory.h"
46 #include "core/animation/css/CSSAnimations.h" 46 #include "core/animation/css/CSSAnimations.h"
47 #include "core/css/CSSCalculationValue.h" 47 #include "core/css/CSSCalculationValue.h"
48 #include "core/css/CSSCustomIdentValue.h" 48 #include "core/css/CSSCustomIdentValue.h"
49 #include "core/css/CSSDefaultStyleSheets.h" 49 #include "core/css/CSSDefaultStyleSheets.h"
50 #include "core/css/CSSFontSelector.h" 50 #include "core/css/CSSFontSelector.h"
51 #include "core/css/CSSIdentifierValue.h" 51 #include "core/css/CSSIdentifierValue.h"
52 #include "core/css/CSSKeyframeRule.h" 52 #include "core/css/CSSKeyframeRule.h"
53 #include "core/css/CSSKeyframesRule.h" 53 #include "core/css/CSSKeyframesRule.h"
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 ? entry.key.cssProperty() 1175 ? entry.key.cssProperty()
1176 : entry.key.presentationAttribute(); 1176 : entry.key.presentationAttribute();
1177 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) 1177 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
1178 continue; 1178 continue;
1179 const Interpolation& interpolation = *entry.value.front(); 1179 const Interpolation& interpolation = *entry.value.front();
1180 if (interpolation.isInvalidatableInterpolation()) { 1180 if (interpolation.isInvalidatableInterpolation()) {
1181 CSSInterpolationTypesMap map(state.document().propertyRegistry()); 1181 CSSInterpolationTypesMap map(state.document().propertyRegistry());
1182 InterpolationEnvironment environment(map, state); 1182 InterpolationEnvironment environment(map, state);
1183 InvalidatableInterpolation::applyStack(entry.value, environment); 1183 InvalidatableInterpolation::applyStack(entry.value, environment);
1184 } else { 1184 } else {
1185 // TODO(alancutter): Remove this old code path once animations have 1185 toTransitionInterpolation(interpolation).apply(state);
1186 // completely migrated to InterpolationTypes.
1187 toLegacyStyleInterpolation(interpolation).apply(state);
1188 } 1186 }
1189 } 1187 }
1190 } 1188 }
1191 1189
1192 static inline bool isValidCueStyleProperty(CSSPropertyID id) { 1190 static inline bool isValidCueStyleProperty(CSSPropertyID id) {
1193 switch (id) { 1191 switch (id) {
1194 case CSSPropertyBackground: 1192 case CSSPropertyBackground:
1195 case CSSPropertyBackgroundAttachment: 1193 case CSSPropertyBackgroundAttachment:
1196 case CSSPropertyBackgroundClip: 1194 case CSSPropertyBackgroundClip:
1197 case CSSPropertyBackgroundColor: 1195 case CSSPropertyBackgroundColor:
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 1930
1933 DEFINE_TRACE(StyleResolver) { 1931 DEFINE_TRACE(StyleResolver) {
1934 visitor->trace(m_matchedPropertiesCache); 1932 visitor->trace(m_matchedPropertiesCache);
1935 visitor->trace(m_selectorFilter); 1933 visitor->trace(m_selectorFilter);
1936 visitor->trace(m_styleSharingLists); 1934 visitor->trace(m_styleSharingLists);
1937 visitor->trace(m_document); 1935 visitor->trace(m_document);
1938 visitor->trace(m_tracker); 1936 visitor->trace(m_tracker);
1939 } 1937 }
1940 1938
1941 } // namespace blink 1939 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698