diff options
| author | loyso <loyso@chromium.org> | 2015-11-03 20:27:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-04 04:28:34 +0000 |
| commit | 429e65a60baa76cbeefa4451483e44dcf7cbfcf7 (patch) | |
| tree | a37453fe1373ff803adf31fbe58dafcb3e06f002 /cc | |
| parent | f12a82abdbf3f43d1a9a0669d250020af1eca491 (diff) | |
| download | chromium_src-429e65a60baa76cbeefa4451483e44dcf7cbfcf7.zip chromium_src-429e65a60baa76cbeefa4451483e44dcf7cbfcf7.tar.gz chromium_src-429e65a60baa76cbeefa4451483e44dcf7cbfcf7.tar.bz2 | |
CC AnimationHost: Fix LinkHighlights detach scope.
In a new world with external cc::AnimationHost
blink::WebCompositorAnimationPlayer objects may outsurvive the compositor
(LayerTreeView and AnimationHost).
In this case, they become detached.
(See RenderWidget::Close())
See the related fix for ProgrammaticScrollAnimator here:
https://codereview.chromium.org/1420913008
BUG=541069
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1413373007
Cr-Commit-Position: refs/heads/master@{#357755}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/animation/animation_timeline.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/animation/animation_timeline.cc b/cc/animation/animation_timeline.cc index c3f5e69..a5d320b 100644 --- a/cc/animation/animation_timeline.cc +++ b/cc/animation/animation_timeline.cc @@ -50,8 +50,6 @@ void AnimationTimeline::DetachPlayer(scoped_refptr<AnimationPlayer> player) { ErasePlayers(iter, iter + 1); break; } - - player->SetAnimationHost(nullptr); } AnimationPlayer* AnimationTimeline::GetPlayerById(int player_id) const { @@ -103,6 +101,7 @@ void AnimationTimeline::ErasePlayers(AnimationPlayerList::iterator begin, if (player->element_animations()) player->DetachLayer(); player->SetAnimationTimeline(nullptr); + player->SetAnimationHost(nullptr); } players_.erase(begin, end); |