OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "TreeSynchronizer.h" | 7 #include "TreeSynchronizer.h" |
8 | 8 |
9 #include "CCAnimationTestCommon.h" | 9 #include "CCAnimationTestCommon.h" |
10 #include "CCLayerAnimationController.h" | 10 #include "CCLayerAnimationController.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 , m_ccLayerDestructionList(ccLayerDestructionList) | 70 , m_ccLayerDestructionList(ccLayerDestructionList) |
71 { | 71 { |
72 } | 72 } |
73 virtual ~MockLayerChromium() { } | 73 virtual ~MockLayerChromium() { } |
74 | 74 |
75 Vector<int>* m_ccLayerDestructionList; | 75 Vector<int>* m_ccLayerDestructionList; |
76 }; | 76 }; |
77 | 77 |
78 class FakeLayerAnimationController : public CCLayerAnimationController { | 78 class FakeLayerAnimationController : public CCLayerAnimationController { |
79 public: | 79 public: |
80 static PassOwnPtr<FakeLayerAnimationController> create(CCLayerAnimationContr
ollerClient* client) | 80 static scoped_ptr<FakeLayerAnimationController> create(CCLayerAnimationContr
ollerClient* client) |
81 { | 81 { |
82 return adoptPtr(new FakeLayerAnimationController(client)); | 82 return make_scoped_ptr(new FakeLayerAnimationController(client)); |
83 } | 83 } |
84 | 84 |
85 bool synchronizedAnimations() const { return m_synchronizedAnimations; } | 85 bool synchronizedAnimations() const { return m_synchronizedAnimations; } |
86 | 86 |
87 private: | 87 private: |
88 explicit FakeLayerAnimationController(CCLayerAnimationControllerClient* clie
nt) | 88 explicit FakeLayerAnimationController(CCLayerAnimationControllerClient* clie
nt) |
89 : CCLayerAnimationController(client) | 89 : CCLayerAnimationController(client) |
90 , m_synchronizedAnimations(false) | 90 , m_synchronizedAnimations(false) |
91 { | 91 { |
92 } | 92 } |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 TEST(TreeSynchronizerTest, synchronizeAnimations) | 385 TEST(TreeSynchronizerTest, synchronizeAnimations) |
386 { | 386 { |
387 DebugScopedSetImplThread impl; | 387 DebugScopedSetImplThread impl; |
388 | 388 |
389 CCLayerTreeSettings settings; | 389 CCLayerTreeSettings settings; |
390 scoped_ptr<CCLayerTreeHostImpl> hostImpl = CCLayerTreeHostImpl::create(setti
ngs, 0); | 390 scoped_ptr<CCLayerTreeHostImpl> hostImpl = CCLayerTreeHostImpl::create(setti
ngs, 0); |
391 | 391 |
392 scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create(); | 392 scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create(); |
393 | 393 |
394 FakeLayerAnimationControllerClient dummy; | 394 FakeLayerAnimationControllerClient dummy; |
395 layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::cre
ate(&dummy)); | 395 layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::cre
ate(&dummy).PassAs<CCLayerAnimationController>()); |
396 | 396 |
397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); | 397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer
AnimationController())->synchronizedAnimations()); |
398 | 398 |
399 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay
erTreeRoot.get(), nullptr, hostImpl.get()); | 399 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay
erTreeRoot.get(), nullptr, hostImpl.get()); |
400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.release(), hostImpl.get()); | 400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc
LayerTreeRoot.release(), hostImpl.get()); |
401 | 401 |
402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); | 402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA
nimationController())->synchronizedAnimations()); |
403 } | 403 } |
404 | 404 |
405 } // namespace | 405 } // namespace |
OLD | NEW |