diff options
| author | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-08 18:08:35 +0000 |
|---|---|---|
| committer | ajuma@chromium.org <ajuma@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-08 18:08:35 +0000 |
| commit | 7f5605c1a5cc9229c0bc939576460b465c7e0234 (patch) | |
| tree | 3d865413ef01e8f84cec4986fe79222c170196f9 /webkit | |
| parent | 0941fb4ccdea8df63e16f371b89197e9fee6f83f (diff) | |
| download | chromium_src-7f5605c1a5cc9229c0bc939576460b465c7e0234.zip chromium_src-7f5605c1a5cc9229c0bc939576460b465c7e0234.tar.gz chromium_src-7f5605c1a5cc9229c0bc939576460b465c7e0234.tar.bz2 | |
LayerTreeHost::SetAnimationEvents should use AnimationRegistrar
This makes LayerTreeHost::SetAnimationEvents iterate over all active
animation controllers registered with its AnimationRegistrar instead
of iterating over the layer tree. This allows us to properly deliver
animation events to a layer that has been temporarily removed from
the layer tree when SetAnimationEvents is called.
BUG=196284
Review URL: https://chromiumcodereview.appspot.com/13465014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_impl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc index c540688..d215848 100644 --- a/webkit/compositor_bindings/web_layer_impl.cc +++ b/webkit/compositor_bindings/web_layer_impl.cc @@ -207,8 +207,7 @@ bool WebLayerImpl::hasActiveAnimation() { return layer_->HasActiveAnimation(); } void WebLayerImpl::transferAnimationsTo(WebLayer* other) { DCHECK(other); - static_cast<WebLayerImpl*>(other)->layer_->SetLayerAnimationController( - layer_->ReleaseLayerAnimationController()); + layer_->TransferAnimationsTo(static_cast<WebLayerImpl*>(other)->layer_); } void WebLayerImpl::setForceRenderSurface(bool force_render_surface) { |