Chromium Code Reviews| Index: cc/test/layer_tree_test.h |
| diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h |
| index 33593aae97bdcb855cac031f381eaf2cfbb43a93..d677214128dcef1f6f1f6b19395385416085452b 100644 |
| --- a/cc/test/layer_tree_test.h |
| +++ b/cc/test/layer_tree_test.h |
| @@ -21,6 +21,8 @@ class LayerImpl; |
| class LayerTreeHost; |
| class LayerTreeHostClient; |
| class LayerTreeHostImpl; |
| +class ProxyMain; |
| +class ProxyImpl; |
| class TestContextProvider; |
| class TestGpuMemoryBufferManager; |
| class TestWebGraphicsContext3D; |
| @@ -139,7 +141,6 @@ class TestHooks : public AnimationDelegate { |
| virtual void ReleaseOutputSurfaceOnImpl() {} |
| virtual void FinishGLOnImpl() {} |
| virtual void StartCommitOnImpl() {} |
| - virtual void InitializeImplOnImpl() {} |
| virtual void WillCloseLayerTreeHostOnImpl() {} |
| // Hooks for ProxyMain |
| @@ -251,7 +252,7 @@ class LayerTreeTest : public testing::Test, public TestHooks { |
| virtual void RunTest(bool threaded, bool delegating_renderer); |
| - bool HasImplThread() { return !!impl_thread_; } |
| + bool HasImplThread() const { return !!impl_thread_; } |
| base::SingleThreadTaskRunner* ImplThreadTaskRunner() { |
| DCHECK(proxy()); |
| return proxy()->ImplThreadTaskRunner() ? proxy()->ImplThreadTaskRunner() |
| @@ -274,6 +275,10 @@ class LayerTreeTest : public testing::Test, public TestHooks { |
| FakeOutputSurface* output_surface() { return output_surface_; } |
| int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const; |
| + // Used these only for ProxyMain tests in threaded mode. |
|
Wez
2015/11/10 01:41:50
nit: Used -> Use?
If these are only for tests the
Khushal
2015/11/11 04:17:47
I don't think that's necessary. The file itself is
Wez
2015/11/12 22:30:18
OK, acknowledged.
|
| + ProxyMain* GetProxyMain() const; |
| + ProxyImpl* GetProxyImpl() const; |
| + |
| void DestroyLayerTreeHost(); |
| // By default, output surface recreation is synchronous. |