| Index: Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
|
| index 0c4154e14425832dd124b969c5bfa6742194d828..3ea9e309d288babf57451b62c3c5f10f794769d5 100644
|
| --- a/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/Source/core/animation/CompositorAnimations.cpp
|
| @@ -197,8 +197,8 @@ bool CompositorAnimations::getAnimatedBoundingBox(FloatBox& box, const EffectMod
|
| FloatBox originalBox(box);
|
|
|
| for (size_t j = 0; j < frames.size() - 1; ++j) {
|
| - const AnimatableTransform* startTransform = toAnimatableTransform(frames[j]->getAnimatableValue().get());
|
| - const AnimatableTransform* endTransform = toAnimatableTransform(frames[j+1]->getAnimatableValue().get());
|
| + const AnimatableTransform* startTransform = toAnimatableTransform(frames[j]->getAnimatableValue());
|
| + const AnimatableTransform* endTransform = toAnimatableTransform(frames[j+1]->getAnimatableValue());
|
| if (!startTransform || !endTransform)
|
| return false;
|
|
|
| @@ -268,11 +268,11 @@ bool CompositorAnimations::isCandidateForAnimationOnCompositor(const Timing& tim
|
| case CSSPropertyScale:
|
| case CSSPropertyTranslate:
|
| case CSSPropertyTransform:
|
| - if (toAnimatableTransform(keyframe->getAnimatableValue().get())->transformOperations().dependsOnBoxSize())
|
| + if (toAnimatableTransform(keyframe->getAnimatableValue())->transformOperations().dependsOnBoxSize())
|
| return false;
|
| break;
|
| case CSSPropertyWebkitFilter: {
|
| - const FilterOperations& operations = toAnimatableFilterOperations(keyframe->getAnimatableValue().get())->operations();
|
| + const FilterOperations& operations = toAnimatableFilterOperations(keyframe->getAnimatableValue())->operations();
|
| if (operations.hasFilterThatMovesPixels())
|
| return false;
|
| break;
|
| @@ -622,7 +622,7 @@ void CompositorAnimationsImpl::addKeyframesToCurve(WebCompositorAnimationCurve&
|
| // FIXME: This relies on StringKeyframes being eagerly evaluated, which will
|
| // not happen eventually. Instead we should extract the CSSValue here
|
| // and convert using another set of toAnimatableXXXOperations functions.
|
| - const AnimatableValue* value = keyframe->getAnimatableValue().get();
|
| + const AnimatableValue* value = keyframe->getAnimatableValue();
|
|
|
| switch (curve.type()) {
|
| case WebCompositorAnimationCurve::AnimationCurveTypeFilter: {
|
|
|