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

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

Issue 2811253003: Make InterpolationEnvironment virutal (Closed)
Patch Set: protected Created 3 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
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 17 matching lines...) Expand all
28 * Boston, MA 02110-1301, USA. 28 * Boston, MA 02110-1301, USA.
29 */ 29 */
30 30
31 #include "core/css/resolver/StyleResolver.h" 31 #include "core/css/resolver/StyleResolver.h"
32 32
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/CSSInterpolationEnvironment.h"
38 #include "core/animation/CSSInterpolationTypesMap.h" 39 #include "core/animation/CSSInterpolationTypesMap.h"
39 #include "core/animation/ElementAnimations.h" 40 #include "core/animation/ElementAnimations.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/LegacyStyleInterpolation.h"
44 #include "core/animation/TransitionInterpolation.h" 44 #include "core/animation/TransitionInterpolation.h"
45 #include "core/animation/animatable/AnimatableValue.h" 45 #include "core/animation/animatable/AnimatableValue.h"
46 #include "core/animation/css/CSSAnimatableValueFactory.h" 46 #include "core/animation/css/CSSAnimatableValueFactory.h"
47 #include "core/animation/css/CSSAnimations.h" 47 #include "core/animation/css/CSSAnimations.h"
48 #include "core/css/CSSCalculationValue.h" 48 #include "core/css/CSSCalculationValue.h"
49 #include "core/css/CSSCustomIdentValue.h" 49 #include "core/css/CSSCustomIdentValue.h"
50 #include "core/css/CSSDefaultStyleSheets.h" 50 #include "core/css/CSSDefaultStyleSheets.h"
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 // SVGElement::CollectStyleForPresentationAttribute(). 1228 // SVGElement::CollectStyleForPresentationAttribute().
1229 for (const auto& entry : active_interpolations_map) { 1229 for (const auto& entry : active_interpolations_map) {
1230 CSSPropertyID property = entry.key.IsCSSProperty() 1230 CSSPropertyID property = entry.key.IsCSSProperty()
1231 ? entry.key.CssProperty() 1231 ? entry.key.CssProperty()
1232 : entry.key.PresentationAttribute(); 1232 : entry.key.PresentationAttribute();
1233 if (!CSSPropertyPriorityData<priority>::PropertyHasPriority(property)) 1233 if (!CSSPropertyPriorityData<priority>::PropertyHasPriority(property))
1234 continue; 1234 continue;
1235 const Interpolation& interpolation = *entry.value.front(); 1235 const Interpolation& interpolation = *entry.value.front();
1236 if (interpolation.IsInvalidatableInterpolation()) { 1236 if (interpolation.IsInvalidatableInterpolation()) {
1237 CSSInterpolationTypesMap map(state.GetDocument().GetPropertyRegistry()); 1237 CSSInterpolationTypesMap map(state.GetDocument().GetPropertyRegistry());
1238 InterpolationEnvironment environment(map, state); 1238 CSSInterpolationEnvironment environment(map, state);
1239 InvalidatableInterpolation::ApplyStack(entry.value, environment); 1239 InvalidatableInterpolation::ApplyStack(entry.value, environment);
1240 } else if (interpolation.IsTransitionInterpolation()) { 1240 } else if (interpolation.IsTransitionInterpolation()) {
1241 ToTransitionInterpolation(interpolation).Apply(state); 1241 ToTransitionInterpolation(interpolation).Apply(state);
1242 } else { 1242 } else {
1243 // TODO(alancutter): Move CustomCompositorAnimations off AnimatableValues. 1243 // TODO(alancutter): Move CustomCompositorAnimations off AnimatableValues.
1244 ToLegacyStyleInterpolation(interpolation).Apply(state); 1244 ToLegacyStyleInterpolation(interpolation).Apply(state);
1245 } 1245 }
1246 } 1246 }
1247 } 1247 }
1248 1248
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 2022
2023 DEFINE_TRACE(StyleResolver) { 2023 DEFINE_TRACE(StyleResolver) {
2024 visitor->Trace(matched_properties_cache_); 2024 visitor->Trace(matched_properties_cache_);
2025 visitor->Trace(selector_filter_); 2025 visitor->Trace(selector_filter_);
2026 visitor->Trace(style_sharing_lists_); 2026 visitor->Trace(style_sharing_lists_);
2027 visitor->Trace(document_); 2027 visitor->Trace(document_);
2028 visitor->Trace(tracker_); 2028 visitor->Trace(tracker_);
2029 } 2029 }
2030 2030
2031 } // namespace blink 2031 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp ('k') | third_party/WebKit/Source/core/svg/SVGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698