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

Unified Diff: Source/core/frame/animation/AnimationController.cpp

Issue 101623002: Drop "only composite opacity animations when already in compositing mode". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Seperate window.internals and window.testRunner Created 7 years 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/frame/animation/AnimationController.cpp
diff --git a/Source/core/frame/animation/AnimationController.cpp b/Source/core/frame/animation/AnimationController.cpp
index defa4e5927b8b0e06fc24f0b77c0e7bcfb896438..8521e139a08ee89ddf419b11a46af630f1d36c3d 100644
--- a/Source/core/frame/animation/AnimationController.cpp
+++ b/Source/core/frame/animation/AnimationController.cpp
@@ -265,7 +265,7 @@ bool AnimationControllerPrivate::isRunningAnimationOnRenderer(RenderObject* rend
return animation->isAnimatingProperty(property, false, isRunningNow);
}
-bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(RenderObject *renderer, bool isOpacityAcceleratable) const
+bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(RenderObject *renderer) const
{
RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(renderer);
if (!animation)
@@ -273,7 +273,7 @@ bool AnimationControllerPrivate::isRunningAcceleratableAnimationOnRenderer(Rende
bool acceleratedOnly = false;
bool isRunningNow = true;
- return (isOpacityAcceleratable && animation->isAnimatingProperty(CSSPropertyOpacity, acceleratedOnly, isRunningNow))
+ return animation->isAnimatingProperty(CSSPropertyOpacity, acceleratedOnly, isRunningNow)
|| animation->isAnimatingProperty(CSSPropertyWebkitTransform, acceleratedOnly, isRunningNow)
|| animation->isAnimatingProperty(CSSPropertyWebkitFilter, acceleratedOnly, isRunningNow);
}
@@ -504,9 +504,9 @@ bool AnimationController::isRunningAnimationOnRenderer(RenderObject* renderer, C
return m_data->isRunningAnimationOnRenderer(renderer, property, isRunningNow);
}
-bool AnimationController::isRunningAcceleratableAnimationOnRenderer(RenderObject* renderer, bool isOpacityAcceleratable) const
+bool AnimationController::isRunningAcceleratableAnimationOnRenderer(RenderObject* renderer) const
{
- return m_data->isRunningAcceleratableAnimationOnRenderer(renderer, isOpacityAcceleratable);
+ return m_data->isRunningAcceleratableAnimationOnRenderer(renderer);
}
bool AnimationController::isRunningAcceleratedAnimationOnRenderer(RenderObject* renderer, CSSPropertyID property, bool isRunningNow) const
« no previous file with comments | « Source/core/frame/animation/AnimationController.h ('k') | Source/core/frame/animation/AnimationControllerPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698