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 "CCThreadedTest.h" | 7 #include "CCThreadedTest.h" |
8 | 8 |
9 #include "CCActiveAnimation.h" | 9 #include "CCActiveAnimation.h" |
10 #include "CCAnimationTestCommon.h" | 10 #include "CCAnimationTestCommon.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 return true; | 85 return true; |
86 } | 86 } |
87 | 87 |
88 scoped_ptr<WebCompositorOutputSurface> TestHooks::createOutputSurface() | 88 scoped_ptr<WebCompositorOutputSurface> TestHooks::createOutputSurface() |
89 { | 89 { |
90 return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsConte
xt3DWithTextureTracking::create(WebGraphicsContext3D::Attributes())).PassAs<WebC
ompositorOutputSurface>(); | 90 return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsConte
xt3DWithTextureTracking::create(WebGraphicsContext3D::Attributes())).PassAs<WebC
ompositorOutputSurface>(); |
91 } | 91 } |
92 | 92 |
93 scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testH
ooks, const CCLayerTreeSettings& settings, CCLayerTreeHostImplClient* client) | 93 scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testH
ooks, const CCLayerTreeSettings& settings, CCLayerTreeHostImplClient* client) |
94 { | 94 { |
95 return scoped_ptr<MockLayerTreeHostImpl>(new MockLayerTreeHostImpl(testHooks
, settings, client)); | 95 return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client
)); |
96 } | 96 } |
97 | 97 |
98 void MockLayerTreeHostImpl::beginCommit() | 98 void MockLayerTreeHostImpl::beginCommit() |
99 { | 99 { |
100 CCLayerTreeHostImpl::beginCommit(); | 100 CCLayerTreeHostImpl::beginCommit(); |
101 m_testHooks->beginCommitOnCCThread(this); | 101 m_testHooks->beginCommitOnCCThread(this); |
102 } | 102 } |
103 | 103 |
104 void MockLayerTreeHostImpl::commitComplete() | 104 void MockLayerTreeHostImpl::commitComplete() |
105 { | 105 { |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 m_client.clear(); | 553 m_client.clear(); |
554 if (m_timedOut) { | 554 if (m_timedOut) { |
555 FAIL() << "Test timed out"; | 555 FAIL() << "Test timed out"; |
556 Platform::current()->compositorSupport()->shutdown(); | 556 Platform::current()->compositorSupport()->shutdown(); |
557 return; | 557 return; |
558 } | 558 } |
559 afterTest(); | 559 afterTest(); |
560 Platform::current()->compositorSupport()->shutdown(); | 560 Platform::current()->compositorSupport()->shutdown(); |
561 } | 561 } |
562 | 562 |
563 } // namespace WebKitTests | 563 } // namespace WebKitTests |
OLD | NEW |