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

Unified Diff: Source/core/rendering/compositing/CompositingReasonFinder.cpp

Issue 249423002: Remove the acceleratedCompositingForAnimationEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rm-acceleratedCompositingForAnimationEnabled: rebase Created 6 years, 8 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
Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index e75ce23b07663e562d07d21cf5fd86ee7a4a57a1..d21334866bec1ff1aeb1d9e4761f509053164dff 100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -49,8 +49,6 @@ void CompositingReasonFinder::updateTriggers()
m_compositingTriggers |= PluginTrigger;
if (settings.acceleratedCompositingForCanvasEnabled())
m_compositingTriggers |= CanvasTrigger;
- if (settings.acceleratedCompositingForAnimationEnabled())
- m_compositingTriggers |= AnimationTrigger;
if (settings.compositedScrollingForFramesEnabled())
m_compositingTriggers |= ScrollableInnerFrameTrigger;
if (settings.acceleratedCompositingForFiltersEnabled())
@@ -69,11 +67,6 @@ void CompositingReasonFinder::updateTriggers()
m_compositingTriggers |= ViewportConstrainedPositionedTrigger;
}
-bool CompositingReasonFinder::hasAnimationTrigger() const
-{
- return m_compositingTriggers & AnimationTrigger;
-}
-
bool CompositingReasonFinder::hasOverflowScrollTrigger() const
{
return m_compositingTriggers & OverflowScrollTrigger;
@@ -217,9 +210,6 @@ CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(cons
bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const
{
- if (!(m_compositingTriggers & AnimationTrigger))
- return false;
-
return renderer->style()->shouldCompositeForCurrentAnimations();
}

Powered by Google App Engine
This is Rietveld 408576698