summaryrefslogtreecommitdiffstats
path: root/chromium/cc/animation/keyframe_effect.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/cc/animation/keyframe_effect.h
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/animation/keyframe_effect.h')
-rw-r--r--chromium/cc/animation/keyframe_effect.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/cc/animation/keyframe_effect.h b/chromium/cc/animation/keyframe_effect.h
index 500f0bd5352..3bcb0347439 100644
--- a/chromium/cc/animation/keyframe_effect.h
+++ b/chromium/cc/animation/keyframe_effect.h
@@ -121,19 +121,17 @@ class CC_ANIMATION_EXPORT KeyframeEffect {
bool HasNonDeletedKeyframeModel() const;
- bool HasOnlyTranslationTransforms(ElementListType list_type) const;
-
bool AnimationsPreserveAxisAlignment() const;
- // Sets |start_scale| to the maximum of starting keyframe_model scale along
- // any dimension at any destination in active KeyframeModels. Returns false
- // if the starting scale cannot be computed.
- bool AnimationStartScale(ElementListType, float* start_scale) const;
-
- // Sets |max_scale| to the maximum scale along any dimension at any
- // destination in active KeyframeModels. Returns false if the maximum scale
- // cannot be computed.
- bool MaximumTargetScale(ElementListType, float* max_scale) const;
+ // Gets scales transform animations. On return, |maximum_scale| is the maximum
+ // scale along any dimension at any destination in active scale animations,
+ // and |starting_scale| is the maximum of starting animation scale along any
+ // dimension at any destination in active scale animations. They are set to
+ // kNotScaled if there is no active scale animation or the scales cannot be
+ // computed. Returns false if the scales cannot be computed.
+ bool GetAnimationScales(ElementListType,
+ float* maximum_scale,
+ float* starting_scale) const;
// Returns true if there is a keyframe_model that is either currently
// animating the given property or scheduled to animate this property in the
@@ -169,6 +167,7 @@ class CC_ANIMATION_EXPORT KeyframeEffect {
private:
void StartKeyframeModels(base::TimeTicks monotonic_time);
void PromoteStartedKeyframeModels(AnimationEvents* events);
+ void PurgeDeletedKeyframeModels();
void MarkKeyframeModelsForDeletion(base::TimeTicks, AnimationEvents* events);
void MarkFinishedKeyframeModels(base::TimeTicks monotonic_time);