diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 19:20:08 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 19:20:08 +0000 |
| commit | b60610611d182f452267e1a2fa5928f3f8dc78e8 (patch) | |
| tree | 52c2452de97adbccd7052184edf913d6ec1cfc60 /cc/test/layer_tree_test.cc | |
| parent | cbb79e16a8a4e926d765cd119381a260e0c6e3a9 (diff) | |
| download | chromium_src-b60610611d182f452267e1a2fa5928f3f8dc78e8.zip chromium_src-b60610611d182f452267e1a2fa5928f3f8dc78e8.tar.gz chromium_src-b60610611d182f452267e1a2fa5928f3f8dc78e8.tar.bz2 | |
cc: Fixed unittests that counted the number of tree activations.
Some of the configurations were not even hitting any EXPECT statements.
BUG=383157
Review URL: https://codereview.chromium.org/345413005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_test.cc')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 8383126..3437f8c 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -159,12 +159,17 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { virtual void CommitComplete() OVERRIDE { LayerTreeHostImpl::CommitComplete(); - test_hooks_->CommitCompleteOnThread(this); + // A few tests count the number of times pending tree is activated. + // When not using impl-side painting, ActivatePendingTree is not called, + // so call these test hooks functions explicitly so that they do need + // to handle non-impl-side path explicitly. if (!settings().impl_side_painting) { test_hooks_->WillActivateTreeOnThread(this); test_hooks_->DidActivateTreeOnThread(this); } + + test_hooks_->CommitCompleteOnThread(this); } virtual DrawResult PrepareToDraw(FrameData* frame) OVERRIDE { |