diff options
| author | loyso <loyso@chromium.org> | 2015-05-27 21:10:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 04:10:44 +0000 |
| commit | 5719778b3aa0a3acbc8202f8c689b6a25d0372c0 (patch) | |
| tree | 3d65068ebad1f5b371ef9e817b17a79f8981c4ca /cc/blink | |
| parent | 37e26d0ef803a93a1c7578cc308ae6492fe50d3b (diff) | |
| download | chromium_src-5719778b3aa0a3acbc8202f8c689b6a25d0372c0.zip chromium_src-5719778b3aa0a3acbc8202f8c689b6a25d0372c0.tar.gz chromium_src-5719778b3aa0a3acbc8202f8c689b6a25d0372c0.tar.bz2 | |
CC Animations: Make LayerAnimationController creation optional
Don't call SetAnimationRegistrar directly - make RegisterForAnimations explicit.
Previous episodes:
https://codereview.chromium.org/1122393003/
https://codereview.chromium.org/1159633002/
This is a prerequisite to implement compositor animation timelines. Next episode:
https://codereview.chromium.org/947033002/
BUG=394777
R=ajuma@chromium.org
R=vollick@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1101823002
Cr-Commit-Position: refs/heads/master@{#331739}
Diffstat (limited to 'cc/blink')
| -rw-r--r-- | cc/blink/web_layer_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index bfe4616..f0fd873 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -65,7 +65,8 @@ WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) { WebLayerImpl::~WebLayerImpl() { layer_->ClearRenderSurface(); - layer_->set_layer_animation_delegate(nullptr); + if (animation_delegate_adapter_.get()) + layer_->set_layer_animation_delegate(nullptr); web_layer_client_ = nullptr; } |