| Index: cc/test/layer_tree_test.h
|
| diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
|
| index d682495316cb0ed0a806d5d72483e83feaba00c9..cba971d88fec07ce836e01039b61d83da93a622f 100644
|
| --- a/cc/test/layer_tree_test.h
|
| +++ b/cc/test/layer_tree_test.h
|
| @@ -124,7 +124,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
| virtual void BeginTest() = 0;
|
| virtual void SetupTree();
|
|
|
| - virtual void RunTest(CompositorMode mode, bool delegating_renderer);
|
| + virtual void RunTest(CompositorMode mode);
|
|
|
| bool HasImplThread() const { return !!impl_thread_; }
|
| base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
|
| @@ -145,7 +145,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
|
|
| LayerTreeHost* layer_tree_host();
|
| LayerTreeHost* remote_client_layer_tree_host();
|
| - bool delegating_renderer() const { return delegating_renderer_; }
|
| SharedBitmapManager* shared_bitmap_manager() const {
|
| return shared_bitmap_manager_.get();
|
| }
|
| @@ -201,7 +200,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
| bool scheduled_ = false;
|
| bool started_ = false;
|
| bool ended_ = false;
|
| - bool delegating_renderer_ = false;
|
|
|
| int timeout_seconds_ = false;
|
|
|
| @@ -221,34 +219,18 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
|
|
| } // namespace cc
|
|
|
| -#define SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
|
| - TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DirectRenderer) { \
|
| - RunTest(CompositorMode::SINGLE_THREADED, false); \
|
| - } \
|
| - class SingleThreadDirectImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
| -
|
| #define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \
|
| TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) { \
|
| - RunTest(CompositorMode::SINGLE_THREADED, true); \
|
| + RunTest(CompositorMode::SINGLE_THREADED); \
|
| } \
|
| class SingleThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
|
|
| -#define MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
|
| - TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DirectRenderer) { \
|
| - RunTest(CompositorMode::THREADED, false); \
|
| - } \
|
| - class MultiThreadDirectImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
| -
|
| #define MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
|
| TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DelegatingRenderer) { \
|
| - RunTest(CompositorMode::THREADED, true); \
|
| + RunTest(CompositorMode::THREADED); \
|
| } \
|
| class MultiThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
|
|
| -#define SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
|
| - SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
|
| - MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME)
|
| -
|
| #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
|
| SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \
|
| MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
|
|
|