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
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 0a52968..2be7527 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -856,16 +856,25 @@
virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
switch (host_impl->active_tree()->source_frame_number()) {
- case 2: {
+ case 0: {
+ // The activate for the 1st mailbox should have happened before now.
+ EXPECT_EQ(1, activate_count_);
+ break;
+ }
+ case 1: {
// The activate for the 2nd mailbox should have happened before now.
EXPECT_EQ(2, activate_count_);
break;
}
- case 3: {
+ case 2: {
// The activate to remove the layer should have happened before now.
EXPECT_EQ(3, activate_count_);
break;
}
+ case 3: {
+ NOTREACHED();
+ break;
+ }
}
}
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 @@
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 {
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index 37c928b..a181b09 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -1760,16 +1760,25 @@
virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
switch (host_impl->active_tree()->source_frame_number()) {
- case 2: {
+ case 0: {
+ // The activate for the 1st frame should have happened before now.
+ EXPECT_EQ(1, activate_count_);
+ break;
+ }
+ case 1: {
// The activate for the 2nd frame should have happened before now.
EXPECT_EQ(2, activate_count_);
break;
}
- case 3: {
+ case 2: {
// The activate to remove the layer should have happened before now.
EXPECT_EQ(3, activate_count_);
break;
}
+ case 3: {
+ NOTREACHED();
+ break;
+ }
}
}
