third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 10 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

« third_party/WebKit/Source/platform/animation/WebTransformOperations.cpp ('K') | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h ('k') | third_party/WebKit/Source/web/LinkHighlightImpl.h » ('j') | third_party/WebKit/Source/web/LinkHighlightImpl.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/scroll/ScrollAnimatorCompositorCoordinator.h"	5 #include "platform/scroll/ScrollAnimatorCompositorCoordinator.h"

6	6

	7 #include "cc/animation/animation_player.h"

	8 #include "cc/animation/animation_timeline.h"

	9 #include "platform/CompositorFactory.h"

7 #include "platform/RuntimeEnabledFeatures.h"	10 #include "platform/RuntimeEnabledFeatures.h"

	11 #include "platform/animation/WebCompositorAnimationPlayer.h"

	12 #include "platform/animation/WebCompositorAnimationTimeline.h"

8 #include "platform/graphics/GraphicsLayer.h"	13 #include "platform/graphics/GraphicsLayer.h"

9 #include "platform/scroll/ScrollableArea.h"	14 #include "platform/scroll/ScrollableArea.h"

10 #include "public/platform/Platform.h"	15 #include "public/platform/Platform.h"

11 #include "public/platform/WebCompositorAnimationPlayer.h"

12 #include "public/platform/WebCompositorAnimationTimeline.h"

13 #include "public/platform/WebCompositorSupport.h"	16 #include "public/platform/WebCompositorSupport.h"

14	17

15 namespace blink {	18 namespace blink {

16	19

17 ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()	20 ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()

18 : m_compositorAnimationAttachedToLayerId(0)	21 : m_compositorAnimationAttachedToLayerId(0)

19 , m_runState(RunState::Idle)	22 , m_runState(RunState::Idle)

20 , m_compositorAnimationId(0)	23 , m_compositorAnimationId(0)

21 , m_compositorAnimationGroupId(0)	24 , m_compositorAnimationGroupId(0)

22 {	25 {

23 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {	26 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

24 ASSERT(Platform::current()->compositorSupport());	27 ASSERT(Platform::current()->compositorSupport());

25 m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()-> createAnimationPlayer());	28 m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimati onPlayer());

26 ASSERT(m_compositorPlayer);	29 ASSERT(m_compositorPlayer);

27 m_compositorPlayer->setAnimationDelegate(this);	30 m_compositorPlayer->setAnimationDelegate(this);

28 }	31 }

29 }	32 }

30	33

31 ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()	34 ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()

32 {	35 {

33 if (m_compositorPlayer) {	36 if (m_compositorPlayer) {

34 m_compositorPlayer->setAnimationDelegate(nullptr);	37 m_compositorPlayer->setAnimationDelegate(nullptr);

35 m_compositorPlayer.clear();	38 m_compositorPlayer.clear();

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 // animation.	192 // animation.

190 notifyCompositorAnimationFinished(group);	193 notifyCompositorAnimationFinished(group);

191 }	194 }

192	195

193 WebCompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPla yer() const	196 WebCompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPla yer() const

194 {	197 {

195 return m_compositorPlayer.get();	198 return m_compositorPlayer.get();

196 }	199 }

197	200

198 } // namespace blink	201 } // namespace blink

OLD	NEW