diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:27:01 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:27:01 +0000 |
| commit | 66bfba6684d26e1eeaed4eacdb5a7e77f11c6725 (patch) | |
| tree | f2b62e18342d88ccaa0770d77eac3d725c061cf7 /cc | |
| parent | a4d338aa5349f7944609c6e47c213c50aa7a5b64 (diff) | |
| download | chromium_src-66bfba6684d26e1eeaed4eacdb5a7e77f11c6725.zip chromium_src-66bfba6684d26e1eeaed4eacdb5a7e77f11c6725.tar.gz chromium_src-66bfba6684d26e1eeaed4eacdb5a7e77f11c6725.tar.bz2 | |
cc: Make TestEnded() true immediately after EndTest()
The test change here fixes differences between when did commit and draw
frame happens for single and threaded compositor tests. This was
causing a difference in the update counts for layers, as one version
would commit an extra time because the test wasn't done when it was
called.
This is just pre-refactoring of tests to make future patches for this
bug cleaner.
R=danakj@chromium.org
BUG=256381
Review URL: https://chromiumcodereview.appspot.com/18179011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 4 | ||||
| -rw-r--r-- | cc/trees/layer_tree_host_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 6a43505..6d7a4d6 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -323,6 +323,8 @@ LayerTreeTest::~LayerTreeTest() {} void LayerTreeTest::EndTest() { // For the case where we EndTest during BeginTest(), set a flag to indicate // that the test should end the second BeginTest regains control. + ended_ = true; + if (beginning_) { end_when_begin_returns_ = true; } else if (proxy()) { @@ -454,8 +456,6 @@ void LayerTreeTest::ScheduleComposite() { } void LayerTreeTest::RealEndTest() { - ended_ = true; - if (layer_tree_host_ && proxy()->CommitPendingForTesting()) { proxy()->MainThreadTaskRunner()->PostTask( FROM_HERE, diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 9d4650c..2934cd7 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -1554,7 +1554,7 @@ class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit } } - virtual void DidCommitAndDrawFrame() OVERRIDE { + virtual void DidCommit() OVERRIDE { if (!TestEnded()) root_layer_->SetNeedsDisplay(); } |