summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_test.cc
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-01-29 13:38:54 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-29 21:39:41 +0000
commitc67de28bb2624a02fb1937b0f9c9b8ee160370c9 (patch)
treeaeda903704f37d1d2ebef9ad76788a9e5b52e0bb /cc/test/layer_tree_test.cc
parentfd1627878734662118298121717c21043b59e1da (diff)
downloadchromium_src-c67de28bb2624a02fb1937b0f9c9b8ee160370c9.zip
chromium_src-c67de28bb2624a02fb1937b0f9c9b8ee160370c9.tar.gz
chromium_src-c67de28bb2624a02fb1937b0f9c9b8ee160370c9.tar.bz2
cc: Fix flakiness in LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest
This test was expecting the main thread copy request to happen before a new draw happens on the compositor thread which is racey. Instead do this comparison on the main thread by posting and trying to end the test after the draw happens but checking for the copy request result there on the main thread instead of on the impl thread before posting. R=vmpstr, weiliangc BUG=439649 Review URL: https://codereview.chromium.org/888663003 Cr-Commit-Position: refs/heads/master@{#313797}
Diffstat (limited to 'cc/test/layer_tree_test.cc')
-rw-r--r--cc/test/layer_tree_test.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 001aa13..a40a8c7 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -573,11 +573,6 @@ void LayerTreeTest::PostCompositeImmediatelyToMainThread() {
main_thread_weak_ptr_));
}
-void LayerTreeTest::PostEndTestToMainThread() {
- main_task_runner_->PostTask(
- FROM_HERE, base::Bind(&LayerTreeTest::EndTest, main_thread_weak_ptr_));
-}
-
void LayerTreeTest::WillBeginTest() {
layer_tree_host_->SetLayerTreeHostClientReady();
}