Commit 9dac9ec5 authored by ajuma@chromium.org's avatar ajuma@chromium.org

Make CompositingReasonFinder::requiresCompositingForAnimation take RenderStyle*

This makes CompositingReasonFinder::requiresCompositingForAnimation
take a RenderStyle* rather than a RenderObject*.

Review URL: https://codereview.chromium.org/317013005

git-svn-id: svn://svn.chromium.org/blink/trunk@175692 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9edb9a04
...@@ -92,7 +92,7 @@ CompositingReasons CompositingReasonFinder::styleDeterminedReasons(RenderObject* ...@@ -92,7 +92,7 @@ CompositingReasons CompositingReasonFinder::styleDeterminedReasons(RenderObject*
if (style->backfaceVisibility() == BackfaceVisibilityHidden) if (style->backfaceVisibility() == BackfaceVisibilityHidden)
directReasons |= CompositingReasonBackfaceVisibilityHidden; directReasons |= CompositingReasonBackfaceVisibilityHidden;
if (requiresCompositingForAnimation(renderer)) if (requiresCompositingForAnimation(style))
directReasons |= CompositingReasonActiveAnimation; directReasons |= CompositingReasonActiveAnimation;
if (style->hasWillChangeCompositingHint() && !style->subtreeWillChangeContents()) if (style->hasWillChangeCompositingHint() && !style->subtreeWillChangeContents())
...@@ -148,12 +148,12 @@ CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(cons ...@@ -148,12 +148,12 @@ CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(cons
return directReasons; return directReasons;
} }
bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const bool CompositingReasonFinder::requiresCompositingForAnimation(RenderStyle* style) const
{ {
if (renderer->style()->subtreeWillChangeContents()) if (style->subtreeWillChangeContents())
return renderer->style()->isRunningAnimationOnCompositor(); return style->isRunningAnimationOnCompositor();
return renderer->style()->shouldCompositeForCurrentAnimations(); return style->shouldCompositeForCurrentAnimations();
} }
bool CompositingReasonFinder::requiresCompositingForPosition(RenderObject* renderer, const RenderLayer* layer, RenderLayer::ViewportConstrainedNotCompositedReason* viewportConstrainedNotCompositedReason) const bool CompositingReasonFinder::requiresCompositingForPosition(RenderObject* renderer, const RenderLayer* layer, RenderLayer::ViewportConstrainedNotCompositedReason* viewportConstrainedNotCompositedReason) const
......
...@@ -36,7 +36,7 @@ private: ...@@ -36,7 +36,7 @@ private:
bool requiresCompositingForTransform(RenderObject*) const; bool requiresCompositingForTransform(RenderObject*) const;
bool requiresCompositingForFilters(RenderObject*) const; bool requiresCompositingForFilters(RenderObject*) const;
bool requiresCompositingForAnimation(RenderObject*) const; bool requiresCompositingForAnimation(RenderStyle*) const;
bool requiresCompositingForPositionSticky(RenderObject*, const RenderLayer*) const; bool requiresCompositingForPositionSticky(RenderObject*, const RenderLayer*) const;
bool requiresCompositingForPositionFixed(RenderObject*, const RenderLayer*, RenderLayer::ViewportConstrainedNotCompositedReason*) const; bool requiresCompositingForPositionFixed(RenderObject*, const RenderLayer*, RenderLayer::ViewportConstrainedNotCompositedReason*) const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment