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

Unified Diff: cc/layers/layer_utils.cc

Issue 1010663002: CC Animations: Redirect all compositor animation requests to AnimationHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@introduce
Patch Set: Rebase and fix conflicts (HasPotentiallyRunningTransformAnimation) Created 5 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
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_utils.cc
diff --git a/cc/layers/layer_utils.cc b/cc/layers/layer_utils.cc
index 888174a46d31eb3484422055c959e943533ff4b1..42d0e1b1d756e25dafc5636afa8acbc00e45d186 100644
--- a/cc/layers/layer_utils.cc
+++ b/cc/layers/layer_utils.cc
@@ -13,17 +13,15 @@ namespace cc {
namespace {
bool HasAnimationThatInflatesBounds(const LayerImpl& layer) {
- return layer.layer_animation_controller()->HasAnimationThatInflatesBounds();
+ return layer.HasAnimationThatInflatesBounds();
}
bool HasFilterAnimationThatInflatesBounds(const LayerImpl& layer) {
- return layer.layer_animation_controller()
- ->HasFilterAnimationThatInflatesBounds();
+ return layer.HasFilterAnimationThatInflatesBounds();
}
bool HasTransformAnimationThatInflatesBounds(const LayerImpl& layer) {
- return layer.layer_animation_controller()
- ->HasTransformAnimationThatInflatesBounds();
+ return layer.HasTransformAnimationThatInflatesBounds();
}
inline bool HasAncestorTransformAnimation(const LayerImpl& layer) {
@@ -112,16 +110,14 @@ bool LayerUtils::GetAnimationBounds(const LayerImpl& layer_in, gfx::BoxF* out) {
// Perform the inflation
if (HasFilterAnimationThatInflatesBounds(*layer)) {
gfx::BoxF inflated;
- if (!layer->layer_animation_controller()->FilterAnimationBoundsForBox(
- box, &inflated))
+ if (!layer->FilterAnimationBoundsForBox(box, &inflated))
return false;
box = inflated;
}
if (HasTransformAnimationThatInflatesBounds(*layer)) {
gfx::BoxF inflated;
- if (!layer->layer_animation_controller()->TransformAnimationBoundsForBox(
- box, &inflated))
+ if (!layer->TransformAnimationBoundsForBox(box, &inflated))
return false;
box = inflated;
}
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698