Chromium Code Reviews| Index: cc/ipc/cc_serialization_perftest.cc |
| diff --git a/cc/ipc/cc_serialization_perftest.cc b/cc/ipc/cc_serialization_perftest.cc |
| index a63324ae61d7710267aa708b54b09ee91edbd4c9..528f6de5913ee1d1fd7a1e26989f5da1eac7caf5 100644 |
| --- a/cc/ipc/cc_serialization_perftest.cc |
| +++ b/cc/ipc/cc_serialization_perftest.cc |
| @@ -286,8 +286,15 @@ TEST_F(CCSerializationPerfTest, DelegatedFrame_ManyQuads_100_4000) { |
| UseSingleSharedQuadState::YES); |
| } |
| +#if defined(OS_ANDROID) |
|
jbudorick
2017/02/13 22:29:30
nit: Add a comment that briefly says why this is d
martiniss
2017/02/13 22:35:38
Done
|
| +#define MAYBE_DelegatedFrame_ManyQuads_10_100000 \ |
| + DISABLED_DelegatedFrame_ManyQuads_10_100000 |
| +#else |
| +#define MAYBE_DelegatedFrame_ManyQuads_10_100000 \ |
| + DelegatedFrame_ManyQuads_10_100000 |
| +#endif |
| // Test for compositor frames with 10 render pass and each with 100000 quads. |
| -TEST_F(CCSerializationPerfTest, DelegatedFrame_ManyQuads_10_100000) { |
| +TEST_F(CCSerializationPerfTest, MAYBE_DelegatedFrame_ManyQuads_10_100000) { |
| // One shared quad state for all quads in one render pass. |
| RunCompositorFrameTest("DelegatedFrame_ManyQuads_10_100000", 100000, 10, |
| UseSingleSharedQuadState::YES); |