| 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/scroll_offset_animation_curve.h" | 7 #include "cc/animation/scroll_offset_animation_curve.h" |
| 8 #include "platform/RuntimeEnabledFeatures.h" | 8 #include "platform/RuntimeEnabledFeatures.h" |
| 9 #include "platform/animation/CompositorAnimationPlayer.h" | 9 #include "platform/animation/CompositorAnimationPlayer.h" |
| 10 #include "platform/animation/CompositorAnimationTimeline.h" | 10 #include "platform/animation/CompositorAnimationTimeline.h" |
| 11 #include "platform/graphics/CompositorFactory.h" | 11 #include "platform/graphics/CompositorFactory.h" |
| 12 #include "platform/graphics/GraphicsLayer.h" | 12 #include "platform/graphics/GraphicsLayer.h" |
| 13 #include "platform/scroll/ScrollableArea.h" | 13 #include "platform/scroll/ScrollableArea.h" |
| 14 #include "public/platform/Platform.h" | 14 #include "public/platform/Platform.h" |
| 15 #include "public/platform/WebCompositorSupport.h" | 15 #include "public/platform/WebCompositorSupport.h" |
| 16 | 16 |
| 17 namespace blink { | 17 namespace blink { |
| 18 | 18 |
| 19 ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator() | 19 ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator() |
| 20 : m_compositorAnimationAttachedToLayerId(0) | 20 : m_compositorAnimationAttachedToLayerId(0) |
| 21 , m_runState(RunState::Idle) | 21 , m_runState(RunState::Idle) |
| 22 , m_compositorAnimationId(0) | 22 , m_compositorAnimationId(0) |
| 23 , m_compositorAnimationGroupId(0) | 23 , m_compositorAnimationGroupId(0) |
| 24 { | 24 { |
| 25 #if ENABLE(OILPAN) | |
| 26 ThreadState::current()->registerPreFinalizer(this); | 25 ThreadState::current()->registerPreFinalizer(this); |
| 27 #endif | |
| 28 m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPl
ayer()); | 26 m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPl
ayer()); |
| 29 ASSERT(m_compositorPlayer); | 27 ASSERT(m_compositorPlayer); |
| 30 m_compositorPlayer->setAnimationDelegate(this); | 28 m_compositorPlayer->setAnimationDelegate(this); |
| 31 } | 29 } |
| 32 | 30 |
| 33 ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator() | 31 ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator() |
| 34 { | 32 { |
| 35 #if !ENABLE(OILPAN) | |
| 36 ScrollAnimatorCompositorCoordinator::dispose(); | |
| 37 #endif | |
| 38 } | 33 } |
| 39 | 34 |
| 40 void ScrollAnimatorCompositorCoordinator::dispose() | 35 void ScrollAnimatorCompositorCoordinator::dispose() |
| 41 { | 36 { |
| 42 m_compositorPlayer->setAnimationDelegate(nullptr); | 37 m_compositorPlayer->setAnimationDelegate(nullptr); |
| 43 m_compositorPlayer.clear(); | 38 m_compositorPlayer.clear(); |
| 44 } | 39 } |
| 45 | 40 |
| 46 void ScrollAnimatorCompositorCoordinator::resetAnimationState() | 41 void ScrollAnimatorCompositorCoordinator::resetAnimationState() |
| 47 { | 42 { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 case RunState::PostAnimationCleanup: | 252 case RunState::PostAnimationCleanup: |
| 258 return String("PostAnimationCleanup"); | 253 return String("PostAnimationCleanup"); |
| 259 case RunState::RunningOnCompositorButNeedsTakeover: | 254 case RunState::RunningOnCompositorButNeedsTakeover: |
| 260 return String("RunningOnCompositorButNeedsTakeover"); | 255 return String("RunningOnCompositorButNeedsTakeover"); |
| 261 } | 256 } |
| 262 ASSERT_NOT_REACHED(); | 257 ASSERT_NOT_REACHED(); |
| 263 return String(); | 258 return String(); |
| 264 } | 259 } |
| 265 | 260 |
| 266 } // namespace blink | 261 } // namespace blink |
| OLD | NEW |