Source/core/animation/StringKeyframe.cpp - Issue 292173009: Web Animations - responsive interpolation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/animation/StringKeyframe.cpp

Issue 292173009: Web Animations - responsive interpolation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@0519_MySeparation

Patch Set: applyAndSnapshotAnimatableValue Created 6 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 side-by-side diff with in-line comments

Download patch

« Source/core/animation/StringKeyframe.h ('K') | « Source/core/animation/StringKeyframe.h ('k') | Source/core/animation/interpolation/DeferredLegacyStyleInterpolation.h » ('j') | Source/core/animation/interpolation/DeferredLegacyStyleInterpolation.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/StringKeyframe.cpp

diff --git a/Source/core/animation/StringKeyframe.cpp b/Source/core/animation/StringKeyframe.cpp

index 5c310fe006c073c9e8aa19edff0feb59aa4359ce..99091dbb60ce566e81125579f069a08764278913 100644

--- a/Source/core/animation/StringKeyframe.cpp

+++ b/Source/core/animation/StringKeyframe.cpp

@@ -7,6 +7,7 @@

#include "core/animation/css/CSSAnimations.h"

#include "core/animation/interpolation/DefaultStyleInterpolation.h"

+#include "core/animation/interpolation/DeferredLegacyStyleInterpolation.h"

#include "core/animation/interpolation/LegacyStyleInterpolation.h"

#include "core/animation/interpolation/LengthStyleInterpolation.h"

#include "core/css/resolver/StyleResolver.h"

@@ -113,12 +114,15 @@ PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::

break;

}

+ if (DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*fromCSSValue) || DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*toCSSValue))

+ return DeferredLegacyStyleInterpolation::create(fromCSSValue, toCSSValue, property);

// FIXME: Remove the use of AnimatableValues, RenderStyles and Elements here.

// FIXME: Remove this cache

if (!m_animatableValueCache)

- m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(*element, property, fromCSSValue);

+ m_animatableValueCache = StyleResolver::applyAndSnapshotAnimatableValue(*element, property, *fromCSSValue);

shans 2014/05/26 03:31:01 This is a bad name. Can we go back to createAnimat

Eric Willigers 2014/05/26 06:32:47 Done.

- RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::createAnimatableValueSnapshot(*element, property, toCSSValue);

+ RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::applyAndSnapshotAnimatableValue(*element, property, *toCSSValue);

toStringPropertySpecificKeyframe(end)->m_animatableValueCache = to;

return LegacyStyleInterpolation::create(m_animatableValueCache.get(), to.release(), property);