diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/cc/animation/keyframe_effect.h | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/animation/keyframe_effect.h')
-rw-r--r-- | chromium/cc/animation/keyframe_effect.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chromium/cc/animation/keyframe_effect.h b/chromium/cc/animation/keyframe_effect.h index 8db169e783b..4ee5176e517 100644 --- a/chromium/cc/animation/keyframe_effect.h +++ b/chromium/cc/animation/keyframe_effect.h @@ -41,12 +41,6 @@ typedef size_t KeyframeEffectId; // given target. class CC_ANIMATION_EXPORT KeyframeEffect { public: - class AnimationTimeProvider { - public: - virtual base::TimeTicks GetTimeForKeyframeModel( - const KeyframeModel&) const = 0; - }; - explicit KeyframeEffect(KeyframeEffectId id); ~KeyframeEffect(); @@ -87,8 +81,7 @@ class CC_ANIMATION_EXPORT KeyframeEffect { void AttachElement(ElementId element_id); void DetachElement(); - void Tick(base::TimeTicks monotonic_time, - const AnimationTimeProvider* tick_provider); + void Tick(base::TimeTicks monotonic_time); static void TickKeyframeModel(base::TimeTicks monotonic_time, KeyframeModel* keyframe_model, AnimationTarget* target); @@ -98,6 +91,8 @@ class CC_ANIMATION_EXPORT KeyframeEffect { void UpdateState(bool start_ready_keyframe_models, AnimationEvents* events); void UpdateTickingState(UpdateTickingType type); + void Pause(base::TimeDelta pause_offset); + void AddKeyframeModel(std::unique_ptr<KeyframeModel> keyframe_model); void PauseKeyframeModel(int keyframe_model_id, double time_offset); void RemoveKeyframeModel(int keyframe_model_id); |