cc/animation/layer_animation_controller.cc - Issue 642983003: cc: Make PictureLayerImpl use a better choice for animated raster scale.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/animation/layer_animation_controller.cc

Issue 642983003: cc: Make PictureLayerImpl use a better choice for animated raster scale. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« cc/animation/keyframed_animation_curve_unittest.cc ('K') | « cc/animation/keyframed_animation_curve_unittest.cc ('k') | cc/animation/transform_operations.h » ('j') | cc/layers/picture_layer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/animation/layer_animation_controller.cc

diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc

index 911c5c426f57814305e2d69fb7ddf352290480bd..8243f69ca05c536bb460f68db9b17d8b38bbc07f 100644

--- a/cc/animation/layer_animation_controller.cc

+++ b/cc/animation/layer_animation_controller.cc

@@ -5,6 +5,7 @@

#include "cc/animation/layer_animation_controller.h"

#include <algorithm>

+#include <vector>

#include "cc/animation/animation.h"

#include "cc/animation/animation_delegate.h"

@@ -504,7 +505,7 @@ bool LayerAnimationController::MaximumScale(float* max_scale) const {

const TransformAnimationCurve* transform_animation_curve =

animations_[i]->curve()->ToTransformAnimationCurve();

float animation_scale = 0.f;

- if (!transform_animation_curve->MaximumScale(&animation_scale))

+ if (!transform_animation_curve->MaximumTargetScale(&animation_scale))

return false;

*max_scale = std::max(*max_scale, animation_scale);

}