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

Unified Diff: Source/core/rendering/RenderLayerCompositor.cpp

Issue 23890025: WIP (Introduce WTF::NonNullPtr<T>.) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698