diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:03:17 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:06:51 +0000 |
commit | 4ea293f71923dd464e237f6ef581df22c625c695 (patch) | |
tree | a05083f79e4dd6d69514f8ea17815fc5153de6cf /cc/layers/texture_layer_unittest.cc | |
parent | 4eebe74dc1fd6d3780180361f75707a6be33c3ce (diff) | |
download | chromium_src-4ea293f71923dd464e237f6ef581df22c625c695.zip chromium_src-4ea293f71923dd464e237f6ef581df22c625c695.tar.gz chromium_src-4ea293f71923dd464e237f6ef581df22c625c695.tar.bz2 |
Fix failing (flaky) LayerTreeHostTestLCDNotification test.
This test failed with impl-side painting because PictureLayer did not
skip commits caused by invalidating the layer during Update.
Meanwhile, this CL has some changes that changed the flaky failures
into always-failures. The change is to make the
ThreadProxy::CommitPendingForTesting check not only if a main frame is
in progress, but also if one will happen in the future. The failure was
flaky because the commit would be requested but not happen immediately
when impl-side painting was on due to activation (if the machine was
suitably loaded at the time). I renamed CommitPendingForTesting to
MainFrameWillHappenForTesting because "CommitPending" is a specific
notion in the public API of the scheduler and I didn't want to confuse
these two.
R=ajuma, brianderson, enne
BUG=402449, 397120
Review URL: https://codereview.chromium.org/462803002
Cr-Commit-Position: refs/heads/master@{#289165}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/texture_layer_unittest.cc')
-rw-r--r-- | cc/layers/texture_layer_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 3d4ea23..08309c7 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -1152,7 +1152,7 @@ class TextureLayerNoExtraCommitForMailboxTest virtual void DidCommitAndDrawFrame() OVERRIDE { switch (layer_tree_host()->source_frame_number()) { case 1: - EXPECT_FALSE(proxy()->CommitPendingForTesting()); + EXPECT_FALSE(proxy()->MainFrameWillHappenForTesting()); // Invalidate the texture layer to clear the mailbox before // ending the test. texture_layer_->SetNeedsDisplay(); |