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

Side by Side Diff: Source/core/animation/DeferredLegacyStyleInterpolation.cpp

Issue 1305383006: Oilpan: Unship CSSValues and AnimatableValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/animation/DeferredLegacyStyleInterpolation.h" 6 #include "core/animation/DeferredLegacyStyleInterpolation.h"
7 7
8 #include "core/animation/ElementAnimations.h" 8 #include "core/animation/ElementAnimations.h"
9 #include "core/animation/css/CSSAnimatableValueFactory.h" 9 #include "core/animation/css/CSSAnimatableValueFactory.h"
10 #include "core/css/CSSBasicShapes.h" 10 #include "core/css/CSSBasicShapes.h"
11 #include "core/css/CSSImageValue.h" 11 #include "core/css/CSSImageValue.h"
12 #include "core/css/CSSPrimitiveValue.h" 12 #include "core/css/CSSPrimitiveValue.h"
13 #include "core/css/CSSSVGDocumentValue.h" 13 #include "core/css/CSSSVGDocumentValue.h"
14 #include "core/css/CSSShadowValue.h" 14 #include "core/css/CSSShadowValue.h"
15 #include "core/css/CSSValueList.h" 15 #include "core/css/CSSValueList.h"
16 #include "core/css/Pair.h" 16 #include "core/css/Pair.h"
17 #include "core/css/Rect.h" 17 #include "core/css/Rect.h"
18 #include "core/css/resolver/StyleResolver.h" 18 #include "core/css/resolver/StyleResolver.h"
19 #include "core/css/resolver/StyleResolverState.h" 19 #include "core/css/resolver/StyleResolverState.h"
20 20
21 namespace blink { 21 namespace blink {
22 22
23 void DeferredLegacyStyleInterpolation::apply(StyleResolverState& state) const 23 void DeferredLegacyStyleInterpolation::apply(StyleResolverState& state) const
24 { 24 {
25 if (m_outdated || !state.element()->elementAnimations() || !state.element()- >elementAnimations()->isAnimationStyleChange()) { 25 if (m_outdated || !state.element()->elementAnimations() || !state.element()- >elementAnimations()->isAnimationStyleChange()) {
26 RefPtrWillBeRawPtr<AnimatableValue> startAnimatableValue; 26 RefPtr<AnimatableValue> startAnimatableValue;
27 RefPtrWillBeRawPtr<AnimatableValue> endAnimatableValue; 27 RefPtr<AnimatableValue> endAnimatableValue;
28 28
29 // Snapshot underlying values for neutral keyframes first because non-ne utral keyframes will mutate the StyleResolverState. 29 // Snapshot underlying values for neutral keyframes first because non-ne utral keyframes will mutate the StyleResolverState.
30 if (!m_endCSSValue) { 30 if (!m_endCSSValue) {
31 endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(st ate, m_id, m_endCSSValue.get()); 31 endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(st ate, m_id, m_endCSSValue.get());
32 startAnimatableValue = StyleResolver::createAnimatableValueSnapshot( state, m_id, m_startCSSValue.get()); 32 startAnimatableValue = StyleResolver::createAnimatableValueSnapshot( state, m_id, m_startCSSValue.get());
33 } else { 33 } else {
34 startAnimatableValue = StyleResolver::createAnimatableValueSnapshot( state, m_id, m_startCSSValue.get()); 34 startAnimatableValue = StyleResolver::createAnimatableValueSnapshot( state, m_id, m_startCSSValue.get());
35 endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(st ate, m_id, m_endCSSValue.get()); 35 endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(st ate, m_id, m_endCSSValue.get());
36 } 36 }
37 37
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 146 }
147 147
148 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C SSBasicShape& shape) 148 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C SSBasicShape& shape)
149 { 149 {
150 // FIXME: Should determine the specific shape, and inspect the members. 150 // FIXME: Should determine the specific shape, and inspect the members.
151 return false; 151 return false;
152 } 152 }
153 153
154 DEFINE_TRACE(DeferredLegacyStyleInterpolation) 154 DEFINE_TRACE(DeferredLegacyStyleInterpolation)
155 { 155 {
156 visitor->trace(m_startCSSValue);
157 visitor->trace(m_endCSSValue);
158 visitor->trace(m_innerInterpolation); 156 visitor->trace(m_innerInterpolation);
159 StyleInterpolation::trace(visitor); 157 StyleInterpolation::trace(visitor);
160 } 158 }
161 159
162 } 160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698