Index: cc/test/layer_tree_test_common.cc |
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc |
index da3f43070fcc0e2ec271be9b454cafe1df820fbe..b5cf797b7262a6158a26b5b6e0dfc943e686b663 100644 |
--- a/cc/test/layer_tree_test_common.cc |
+++ b/cc/test/layer_tree_test_common.cc |
@@ -89,9 +89,9 @@ scoped_ptr<WebCompositorOutputSurface> TestHooks::createOutputSurface() |
return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3DWithTextureTracking::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<WebKit::WebCompositorOutputSurface>(); |
} |
-scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client) |
+scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy) |
{ |
- return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client)); |
+ return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client, proxy)); |
} |
void MockLayerTreeHostImpl::beginCommit() |
@@ -132,8 +132,8 @@ base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const |
return base::TimeDelta::FromMilliseconds(16); |
} |
-MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client) |
- : LayerTreeHostImpl(settings, client) |
+MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy) |
+ : LayerTreeHostImpl(settings, client, proxy) |
, m_testHooks(testHooks) |
{ |
} |
@@ -141,10 +141,10 @@ MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTr |
// Adapts LayerTreeHost for test. Injects MockLayerTreeHostImpl. |
class MockLayerTreeHost : public cc::LayerTreeHost { |
public: |
- static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerTreeHostClient* client, scoped_refptr<cc::Layer> rootLayer, const cc::LayerTreeSettings& settings) |
+ static scoped_ptr<MockLayerTreeHost> create(TestHooks* testHooks, cc::LayerTreeHostClient* client, scoped_refptr<cc::Layer> rootLayer, const cc::LayerTreeSettings& settings, cc::Thread* implThread) |
{ |
scoped_ptr<MockLayerTreeHost> layerTreeHost(new MockLayerTreeHost(testHooks, client, settings)); |
- bool success = layerTreeHost->initialize(); |
+ bool success = layerTreeHost->initialize(implThread); |
EXPECT_TRUE(success); |
layerTreeHost->setRootLayer(rootLayer); |
@@ -158,7 +158,7 @@ public: |
virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerTreeHostImplClient* client) |
{ |
- return MockLayerTreeHostImpl::create(m_testHooks, settings(), client).PassAs<cc::LayerTreeHostImpl>(); |
+ return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, proxy()).PassAs<cc::LayerTreeHostImpl>(); |
} |
virtual void didAddAnimation() OVERRIDE |
@@ -275,6 +275,7 @@ ThreadedTest::ThreadedTest() |
, m_finished(false) |
, m_scheduled(false) |
, m_started(false) |
+ , m_implThread(0) |
{ |
} |
@@ -346,11 +347,13 @@ void ThreadedTest::postDidAddAnimationToMainThread() |
void ThreadedTest::doBeginTest() |
{ |
- DCHECK(Proxy::isMainThread()); |
m_client = ThreadedMockLayerTreeHostClient::create(this); |
scoped_refptr<Layer> rootLayer = Layer::create(); |
- m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer, m_settings); |
+ cc::Thread* implCCThread = 0; |
+ if (m_implThread) |
+ implCCThread = cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy()).release(); |
+ m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer, m_settings, implCCThread); |
ASSERT_TRUE(m_layerTreeHost.get()); |
rootLayer->setLayerTreeHost(m_layerTreeHost.get()); |
m_layerTreeHost->setSurfaceReady(); |
@@ -384,13 +387,12 @@ void ThreadedTest::scheduleComposite() |
void ThreadedTest::realEndTest() |
{ |
- DCHECK(Proxy::isMainThread()); |
MessageLoop::current()->Quit(); |
} |
void ThreadedTest::dispatchSetNeedsAnimate() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -401,7 +403,7 @@ void ThreadedTest::dispatchSetNeedsAnimate() |
void ThreadedTest::dispatchAddInstantAnimation() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -412,7 +414,7 @@ void ThreadedTest::dispatchAddInstantAnimation() |
void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation) |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -423,7 +425,7 @@ void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation) |
void ThreadedTest::dispatchSetNeedsAnimateAndCommit() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -436,7 +438,7 @@ void ThreadedTest::dispatchSetNeedsAnimateAndCommit() |
void ThreadedTest::dispatchSetNeedsCommit() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -447,7 +449,7 @@ void ThreadedTest::dispatchSetNeedsCommit() |
void ThreadedTest::dispatchAcquireLayerTextures() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -458,7 +460,7 @@ void ThreadedTest::dispatchAcquireLayerTextures() |
void ThreadedTest::dispatchSetNeedsRedraw() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -469,7 +471,7 @@ void ThreadedTest::dispatchSetNeedsRedraw() |
void ThreadedTest::dispatchSetVisible(bool visible) |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -487,7 +489,7 @@ void ThreadedTest::dispatchComposite() |
void ThreadedTest::dispatchDidAddAnimation() |
{ |
- DCHECK(Proxy::isMainThread()); |
+ DCHECK(!proxy() || proxy()->isMainThread()); |
if (m_finished) |
return; |
@@ -505,25 +507,21 @@ void ThreadedTest::runTest(bool threaded) |
if (threaded) { |
m_implThread.reset(new base::Thread("ThreadedTest")); |
ASSERT_TRUE(m_implThread->Start()); |
- m_implCCThread = cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy()); |
- cc::Proxy::setImplThread(m_implCCThread.get()); |
} |
- DCHECK(Proxy::isMainThread()); |
- m_mainThreadProxy = ScopedThreadProxy::create(Proxy::mainThread()); |
+ m_mainCCThread = cc::ThreadImpl::createForCurrentThread(); |
+ m_mainThreadProxy = ScopedThreadProxy::create(m_mainCCThread.get()); |
initializeSettings(m_settings); |
- cc::Proxy::mainThread()->postTask(base::Bind(&ThreadedTest::doBeginTest, base::Unretained(this))); |
+ m_mainCCThread->postTask(base::Bind(&ThreadedTest::doBeginTest, base::Unretained(this))); |
m_timeout.Reset(base::Bind(&ThreadedTest::timeout, base::Unretained(this))); |
- cc::Proxy::mainThread()->postDelayedTask(m_timeout.callback(), 5000); |
+ m_mainCCThread->postDelayedTask(m_timeout.callback(), 5000); |
MessageLoop::current()->Run(); |
if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer()) |
m_layerTreeHost->rootLayer()->setLayerTreeHost(0); |
m_layerTreeHost.reset(); |
- cc::Proxy::setImplThread(0); |
- |
m_timeout.Cancel(); |
ASSERT_FALSE(m_layerTreeHost.get()); |