Chromium Code Reviews| Index: Source/core/rendering/RenderLayerBacking.cpp |
| diff --git a/Source/core/rendering/RenderLayerBacking.cpp b/Source/core/rendering/RenderLayerBacking.cpp |
| index 1213a77414fd400828adc5b6f17d64980fa0a7f3..b17bbd2a8f67a1a926309b4548a267cffe3b812e 100644 |
| --- a/Source/core/rendering/RenderLayerBacking.cpp |
| +++ b/Source/core/rendering/RenderLayerBacking.cpp |
| @@ -1714,11 +1714,11 @@ bool RenderLayerBacking::startAnimation(double timeOffset, const CSSAnimationDat |
| return false; |
| bool didAnimate = false; |
| - if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.get())) |
| + if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.release())) |
|
Ian Vollick
2013/09/20 15:19:02
This will need to be rebased on top of your previo
dshwang
2013/09/20 15:22:20
Yes, after CL 24198009 is landed, I'll rebase to u
|
| didAnimate = true; |
| - if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.get())) |
| + if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.release())) |
| didAnimate = true; |
| - if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.get())) |
| + if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.release())) |
| didAnimate = true; |
| return didAnimate; |
| @@ -1755,17 +1755,17 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper |
| WebAnimations animations(m_animationProvider->startTransition(timeOffset, property, fromStyle, |
| toStyle, m_owningLayer->hasTransform(), m_owningLayer->hasFilter(), boxSize, fromOpacity, toOpacity)); |
| bool didAnimate = false; |
| - if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.get())) { |
| + if (animations.m_transformAnimation && m_graphicsLayer->addAnimation(animations.m_transformAnimation.release())) { |
| // To ensure that the correct transform is visible when the animation ends, also set the final transform. |
| updateTransform(toStyle); |
| didAnimate = true; |
| } |
| - if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.get())) { |
| + if (animations.m_opacityAnimation && m_graphicsLayer->addAnimation(animations.m_opacityAnimation.release())) { |
| // To ensure that the correct opacity is visible when the animation ends, also set the final opacity. |
| updateOpacity(toStyle); |
| didAnimate = true; |
| } |
| - if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.get())) { |
| + if (animations.m_filterAnimation && m_graphicsLayer->addAnimation(animations.m_filterAnimation.release())) { |
| // To ensure that the correct filter is visible when the animation ends, also set the final filter. |
| updateFilters(toStyle); |
| didAnimate = true; |