| Index: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
|
| index 0cf17edec9e036a5a41d034918b2c36d64b1148d..b5a056d37a90622ff5f6e57234f1c444ad8fb8f4 100644
|
| --- a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
|
| +++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
|
| @@ -38,19 +38,19 @@
|
| m_animationPlayer->set_animation_delegate(delegate ? this : nullptr);
|
| }
|
|
|
| -void CompositorAnimationPlayer::attachElement(const CompositorElementId& id)
|
| +void CompositorAnimationPlayer::attachLayer(WebLayer* webLayer)
|
| {
|
| - m_animationPlayer->AttachElement(id);
|
| + m_animationPlayer->AttachElement(webLayer->id());
|
| }
|
|
|
| -void CompositorAnimationPlayer::detachElement()
|
| +void CompositorAnimationPlayer::detachLayer()
|
| {
|
| m_animationPlayer->DetachElement();
|
| }
|
|
|
| -bool CompositorAnimationPlayer::isElementAttached() const
|
| +bool CompositorAnimationPlayer::isLayerAttached() const
|
| {
|
| - return !!m_animationPlayer->element_id();
|
| + return m_animationPlayer->element_id() != 0;
|
| }
|
|
|
| void CompositorAnimationPlayer::addAnimation(CompositorAnimation* animation)
|
| @@ -59,17 +59,17 @@
|
| delete animation;
|
| }
|
|
|
| -void CompositorAnimationPlayer::removeAnimation(uint64_t animationId)
|
| +void CompositorAnimationPlayer::removeAnimation(int animationId)
|
| {
|
| m_animationPlayer->RemoveAnimation(animationId);
|
| }
|
|
|
| -void CompositorAnimationPlayer::pauseAnimation(uint64_t animationId, double timeOffset)
|
| +void CompositorAnimationPlayer::pauseAnimation(int animationId, double timeOffset)
|
| {
|
| m_animationPlayer->PauseAnimation(animationId, timeOffset);
|
| }
|
|
|
| -void CompositorAnimationPlayer::abortAnimation(uint64_t animationId)
|
| +void CompositorAnimationPlayer::abortAnimation(int animationId)
|
| {
|
| m_animationPlayer->AbortAnimation(animationId);
|
| }
|
|
|