diff options
| author | jaydasika <jaydasika@chromium.org> | 2016-03-22 16:53:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 23:54:53 +0000 |
| commit | 66500aad5711bd511a41d5fdb2521fa865888911 (patch) | |
| tree | 100f904a001c832337989cdedc8eb38da9bc8121 /cc | |
| parent | 0dc8e6b8fb72e8d204c76ffc43be6516f114c91b (diff) | |
| download | chromium_src-66500aad5711bd511a41d5fdb2521fa865888911.zip chromium_src-66500aad5711bd511a41d5fdb2521fa865888911.tar.gz chromium_src-66500aad5711bd511a41d5fdb2521fa865888911.tar.bz2 | |
Enable LayerTreeHostTestGpuRasterDeviceSizeChanged test on win
And make it run only for multi-threaded case as it relies on pending
tree.
BUG=596880
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1827643002
Cr-Commit-Position: refs/heads/master@{#382736}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/trees/layer_tree_host_unittest.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index bd3dd63..5086f7f 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -876,12 +876,8 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest { } void DrawLayersOnThread(LayerTreeHostImpl* impl) override { - // Perform 2 commits. - if (!num_draws_) { + if (num_draws_ < 2) PostSetNeedsRedrawRectToMainThread(invalid_rect_); - } else { - EndTest(); - } num_draws_++; } @@ -904,6 +900,7 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest { EXPECT_EQ( pending_tiling->TilingDataForTesting().max_texture_size().width(), active_tiling->TilingDataForTesting().max_texture_size().width()); + EndTest(); } } @@ -924,10 +921,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: |