Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: cc/animation/animation_timeline.cc

Issue 1413373007: CC AnimationHost: Fix LinkHighlights detach scope. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GC. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/animation/animation_timeline.cc
diff --git a/cc/animation/animation_timeline.cc b/cc/animation/animation_timeline.cc
index c3f5e6918b7f502402d44423e905b4637f0d76b8..a5d320bbcce0bc029b6b07842cc2bcaa540977f1 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);
« no previous file with comments | « no previous file | content/test/web_layer_tree_view_impl_for_testing.h » ('j') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698