Index: cc/test/layer_tree_test.h |
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h |
index 2705833c303f29dd5bb577ed028a59b4303370b0..ea190dd99c63413e61e171855e38b32b57180e4a 100644 |
--- a/cc/test/layer_tree_test.h |
+++ b/cc/test/layer_tree_test.h |
@@ -215,22 +215,40 @@ 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(false, false, false); \ |
- } \ |
+#define SINGLE_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ |
+ TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DirectRenderer_MainThreadPaint) { \ |
+ RunTest(false, false, false); \ |
+ } |
danakj
2014/09/03 17:01:31
Can you put "class SingleThreadDirectNoImplNeedsSe
enne (OOO)
2014/09/03 19:41:28
Done.
|
+ |
+#define SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \ |
+ SINGLE_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
+ TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DirectRenderer_ImplSidePaint) { \ |
+ RunTest(false, false, true); \ |
+ } \ |
class SingleThreadDirectNeedsSemicolon##TEST_FIXTURE_NAME {} |
-#define SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \ |
- TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) { \ |
- RunTest(false, true, false); \ |
- } \ |
+#define SINGLE_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ |
+ TEST_F(TEST_FIXTURE_NAME, \ |
+ RunSingleThread_DelegatingRenderer_MainThreadPaint) { \ |
+ RunTest(false, true, false); \ |
+ } |
danakj
2014/09/03 17:01:31
same here?
enne (OOO)
2014/09/03 19:41:28
Done.
|
+ |
+#define SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \ |
+ SINGLE_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
+ TEST_F(TEST_FIXTURE_NAME, \ |
+ RunSingleThread_DelegatingRenderer_ImplSidePaint) { \ |
+ RunTest(false, true, true); \ |
+ } \ |
class SingleThreadDelegatingNeedsSemicolon##TEST_FIXTURE_NAME {} |
#define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \ |
SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ |
SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) |
+#define SINGLE_THREAD_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ |
+ SINGLE_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
+ SINGLE_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) |
+ |
#define MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) \ |
TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DirectRenderer_MainThreadPaint) { \ |
RunTest(true, false, false); \ |
@@ -264,18 +282,18 @@ class LayerTreeTest : public testing::Test, public TestHooks { |
MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ |
MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) |
-#define SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F( \ |
- TEST_FIXTURE_NAME) \ |
- SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ |
+#define SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F( \ |
+ TEST_FIXTURE_NAME) \ |
+ SINGLE_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
MULTI_THREAD_DIRECT_RENDERER_NOIMPL_TEST_F(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_DELEGATING_RENDERER_NOIMPL_TEST_F( \ |
- TEST_FIXTURE_NAME) \ |
- SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME); \ |
+#define SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F( \ |
+ TEST_FIXTURE_NAME) \ |
+ SINGLE_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME); \ |
MULTI_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(TEST_FIXTURE_NAME) |
#define SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \ |