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

Side by Side Diff: third_party/WebKit/Source/platform/animation/CompositorAnimationTimeline.cpp

Issue 1950243005: Communicate MT changes to impl-only scroll offset animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: attempt to fix rebase issue Created 4 years, 7 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/animation/CompositorAnimationTimeline.h" 5 #include "platform/animation/CompositorAnimationTimeline.h"
6 6
7 #include "cc/animation/animation_host.h" 7 #include "cc/animation/animation_host.h"
8 #include "cc/animation/animation_id_provider.h" 8 #include "cc/animation/animation_id_provider.h"
9 #include "platform/animation/CompositorAnimationHost.h"
9 #include "platform/animation/CompositorAnimationPlayer.h" 10 #include "platform/animation/CompositorAnimationPlayer.h"
10 #include "platform/animation/CompositorAnimationPlayerClient.h" 11 #include "platform/animation/CompositorAnimationPlayerClient.h"
11 12
12 namespace blink { 13 namespace blink {
13 14
14 CompositorAnimationTimeline::CompositorAnimationTimeline() 15 CompositorAnimationTimeline::CompositorAnimationTimeline()
15 : m_animationTimeline(cc::AnimationTimeline::Create(cc::AnimationIdProvider: :NextTimelineId())) 16 : m_animationTimeline(cc::AnimationTimeline::Create(cc::AnimationIdProvider: :NextTimelineId()))
16 { 17 {
17 } 18 }
18 19
19 CompositorAnimationTimeline::~CompositorAnimationTimeline() 20 CompositorAnimationTimeline::~CompositorAnimationTimeline()
20 { 21 {
21 // Detach timeline from host, otherwise it stays there (leaks) until 22 // Detach timeline from host, otherwise it stays there (leaks) until
22 // compositor shutdown. 23 // compositor shutdown.
23 if (m_animationTimeline->animation_host()) 24 if (m_animationTimeline->animation_host())
24 m_animationTimeline->animation_host()->RemoveAnimationTimeline(m_animati onTimeline); 25 m_animationTimeline->animation_host()->RemoveAnimationTimeline(m_animati onTimeline);
25 } 26 }
26 27
27 cc::AnimationTimeline* CompositorAnimationTimeline::animationTimeline() const 28 cc::AnimationTimeline* CompositorAnimationTimeline::animationTimeline() const
28 { 29 {
29 return m_animationTimeline.get(); 30 return m_animationTimeline.get();
30 } 31 }
31 32
33 CompositorAnimationHost CompositorAnimationTimeline::compositorAnimationHost()
34 {
35 return CompositorAnimationHost(m_animationTimeline->animation_host());
36 }
37
32 void CompositorAnimationTimeline::playerAttached(const blink::CompositorAnimatio nPlayerClient& client) 38 void CompositorAnimationTimeline::playerAttached(const blink::CompositorAnimatio nPlayerClient& client)
33 { 39 {
34 if (client.compositorPlayer()) 40 if (client.compositorPlayer())
35 m_animationTimeline->AttachPlayer(client.compositorPlayer()->animationPl ayer()); 41 m_animationTimeline->AttachPlayer(client.compositorPlayer()->animationPl ayer());
36 } 42 }
37 43
38 void CompositorAnimationTimeline::playerDestroyed(const blink::CompositorAnimati onPlayerClient& client) 44 void CompositorAnimationTimeline::playerDestroyed(const blink::CompositorAnimati onPlayerClient& client)
39 { 45 {
40 if (client.compositorPlayer()) 46 if (client.compositorPlayer())
41 m_animationTimeline->DetachPlayer(client.compositorPlayer()->animationPl ayer()); 47 m_animationTimeline->DetachPlayer(client.compositorPlayer()->animationPl ayer());
42 } 48 }
43 49
44 } // namespace blink 50 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698