Index: third_party/WebKit/Source/core/animation/Animation.h |
diff --git a/third_party/WebKit/Source/core/animation/Animation.h b/third_party/WebKit/Source/core/animation/Animation.h |
index 6a0709a724b811192e4447ad3083df2512b889b2..96cc4f876fc3436099175720e010fef897796a74 100644 |
--- a/third_party/WebKit/Source/core/animation/Animation.h |
+++ b/third_party/WebKit/Source/core/animation/Animation.h |
@@ -31,6 +31,7 @@ |
#ifndef Animation_h |
#define Animation_h |
+#include <memory> |
pdr.
2017/03/16 21:20:04
It took me a little while to page this back in. Ca
wkorman
2017/03/16 21:53:31
Will do.
|
#include "bindings/core/v8/ActiveScriptWrappable.h" |
#include "bindings/core/v8/ExceptionState.h" |
#include "bindings/core/v8/ScriptPromise.h" |
@@ -43,9 +44,9 @@ |
#include "core/events/EventTarget.h" |
#include "platform/animation/CompositorAnimationDelegate.h" |
#include "platform/animation/CompositorAnimationPlayerClient.h" |
+#include "platform/graphics/compositing/PaintArtifactCompositor.h" |
#include "platform/heap/Handle.h" |
#include "wtf/RefPtr.h" |
-#include <memory> |
namespace blink { |
@@ -149,9 +150,13 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData, |
void setOutdated(); |
bool outdated() { return m_outdated; } |
- bool canStartAnimationOnCompositor() const; |
- bool isCandidateForAnimationOnCompositor() const; |
- bool maybeStartAnimationOnCompositor(); |
+ bool canStartAnimationOnCompositor(const Optional<CompositorElementIdSet>& |
+ compositedAnimationElementIds) const; |
+ bool isCandidateForAnimationOnCompositor( |
+ const Optional<CompositorElementIdSet>& compositedAnimationElementIds) |
+ const; |
+ bool maybeStartAnimationOnCompositor( |
+ const Optional<CompositorElementIdSet>& compositedAnimationElementIds); |
void cancelAnimationOnCompositor(); |
void restartAnimationOnCompositor(); |
void cancelIncompatibleAnimationsOnCompositor(); |
@@ -168,7 +173,9 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData, |
// Returns whether we should continue with the commit for this animation or |
// wait until next commit. |
- bool preCommit(int compositorGroup, bool startOnCompositor); |
+ bool preCommit(int compositorGroup, |
+ const Optional<CompositorElementIdSet>&, |
+ bool startOnCompositor); |
void postCommit(double timelineTime); |
unsigned sequenceNumber() const { return m_sequenceNumber; } |