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