Index: Source/core/rendering/RenderLayerCompositor.cpp |
diff --git a/Source/core/rendering/RenderLayerCompositor.cpp b/Source/core/rendering/RenderLayerCompositor.cpp |
index 7e69cf5deac8b64d7d9594e6133848eb29a42eb1..d4d162b5727f49e5b9701368c4a4082f056f6966 100644 |
--- a/Source/core/rendering/RenderLayerCompositor.cpp |
+++ b/Source/core/rendering/RenderLayerCompositor.cpp |
@@ -362,7 +362,7 @@ void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update |
if (!m_reevaluateCompositingAfterLayout && !m_compositing) |
return; |
- AnimationUpdateBlock animationUpdateBlock(m_renderView->frameView()->frame().animation()); |
+ AnimationUpdateBlock animationUpdateBlock(m_renderView->frameView()->frame().animation().get()); |
TemporaryChange<bool> postLayoutChange(m_inPostLayoutUpdate, true); |
@@ -2005,10 +2005,7 @@ bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* render |
{ |
if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) |
return false; |
- |
- if (AnimationController* animController = renderer->animation()) |
- return animController->isRunningAcceleratableAnimationOnRenderer(renderer); |
- return false; |
+ return renderer->animation()->isRunningAcceleratableAnimationOnRenderer(renderer); |
} |
bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* renderer) const |
@@ -2200,11 +2197,7 @@ bool RenderLayerCompositor::isRunningAcceleratedTransformAnimation(RenderObject* |
{ |
if (!(m_compositingTriggers & ChromeClient::AnimationTrigger)) |
return false; |
- |
- if (AnimationController* animController = renderer->animation()) |
- return animController->isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform); |
- |
- return false; |
+ return renderer->animation()->isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform); |
} |
// If an element has negative z-index children, those children render in front of the |