summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 13:39:03 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 13:39:03 +0000
commitfd153dda53ced8898c787fdd9a6e639a6000db9d (patch)
treeb4d3c8218c9b9a057b7f34010d3fc700493b7a9b /cc
parent69b46702a82e281af7d91a54a32fe14c0336b028 (diff)
downloadchromium_src-fd153dda53ced8898c787fdd9a6e639a6000db9d.zip
chromium_src-fd153dda53ced8898c787fdd9a6e639a6000db9d.tar.gz
chromium_src-fd153dda53ced8898c787fdd9a6e639a6000db9d.tar.bz2
cc: Fix a flaky LayerTreeHostTestContinuousInvalidate test.
This test assumed that DidCommit() would happen after DrawLayersOnThread(), but with impl painting on this was not happening. Then, the DrawLayersOnThread() would increment the num_draw_layers_ to() had already occured, and we'd invalidate forever until the test timed out. R=enne BUG=241099 Review URL: https://chromiumcodereview.appspot.com/15212003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/trees/layer_tree_host_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 7191712..3426d41 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1701,7 +1701,7 @@ class LayerTreeHostTestContinuousInvalidate : public LayerTreeHostTest {
PostSetNeedsCommitToMainThread();
}
- virtual void DidCommit() OVERRIDE {
+ virtual void DidCommitAndDrawFrame() OVERRIDE {
if (num_draw_layers_ == 2)
return;
content_layer_->SetNeedsDisplay();