Chromium Code Reviews| Index: cc/trees/layer_tree_host_unittest.cc |
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc |
| index bd3dd633ead382602b670e186310e1e8ebfd2f69..6e9b969907a7f5160ba8322da3c1a5752c488176 100644 |
| --- a/cc/trees/layer_tree_host_unittest.cc |
| +++ b/cc/trees/layer_tree_host_unittest.cc |
| @@ -876,12 +876,7 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest { |
| } |
| void DrawLayersOnThread(LayerTreeHostImpl* impl) override { |
| - // Perform 2 commits. |
| - if (!num_draws_) { |
| - PostSetNeedsRedrawRectToMainThread(invalid_rect_); |
| - } else { |
| - EndTest(); |
| - } |
| + PostSetNeedsRedrawRectToMainThread(invalid_rect_); |
|
enne (OOO)
2016/03/22 22:36:42
Can you only do this if num_draws < 2? I would rat
|
| num_draws_++; |
| } |
| @@ -904,6 +899,7 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest { |
| EXPECT_EQ( |
| pending_tiling->TilingDataForTesting().max_texture_size().width(), |
| active_tiling->TilingDataForTesting().max_texture_size().width()); |
| + EndTest(); |
| } |
| } |
| @@ -924,10 +920,9 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest { |
| scoped_refptr<FakePictureLayer> root_layer_; |
| }; |
| -#if !defined(OS_WIN) |
| -// Flaky on win: http://crbug.com/596880 |
| -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged); |
| -#endif |
| +// As there's no pending tree in single-threaded case, this test should run |
| +// only for multi-threaded case. |
| +MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged); |
| class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest { |
| public: |