| Index: third_party/WebKit/Source/core/animation/CompositorPendingAnimations.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.h b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.h
|
| index 22fd6c5b60782cd0a7bfc5ee675ebb560f4a902a..9b16a30bea3d3dc3b70294d20ff2d4ae501d0be5 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.h
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.h
|
| @@ -35,7 +35,9 @@
|
| #include "core/animation/Animation.h"
|
| #include "core/dom/TaskRunnerHelper.h"
|
| #include "platform/Timer.h"
|
| +#include "platform/graphics/compositing/PaintArtifactCompositor.h"
|
| #include "platform/heap/Handle.h"
|
| +#include "wtf/Optional.h"
|
| #include "wtf/Vector.h"
|
|
|
| namespace blink {
|
| @@ -57,14 +59,18 @@ class CORE_EXPORT CompositorPendingAnimations final
|
| void add(Animation*);
|
| // Returns whether we are waiting for an animation to start and should
|
| // service again on the next frame.
|
| - bool update(bool startOnCompositor = true);
|
| + bool update(const Optional<CompositorElementIdSet>&,
|
| + bool startOnCompositor = true);
|
| void notifyCompositorAnimationStarted(double monotonicAnimationStartTime,
|
| int compositorGroup = 0);
|
|
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - void timerFired(TimerBase*) { update(false); }
|
| + // TODO(wkorman): Make sure the below is safe/reasonable.
|
| + void timerFired(TimerBase*) {
|
| + update(Optional<CompositorElementIdSet>(), false);
|
| + }
|
|
|
| HeapVector<Member<Animation>> m_pending;
|
| HeapVector<Member<Animation>> m_waitingForCompositorAnimationStart;
|
|
|