diff options
| author | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 09:05:36 +0000 |
|---|---|---|
| committer | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 09:05:36 +0000 |
| commit | 4d877d82f1552d7aa7bcf6805170c4aa385ab0d4 (patch) | |
| tree | 35941b25944c5b429f461c7fb9ec8a46f31934ec /cc/test | |
| parent | e0402a6c3d8b2ee1d1bd36729b6e4b81fa1914d8 (diff) | |
| download | chromium_src-4d877d82f1552d7aa7bcf6805170c4aa385ab0d4.zip chromium_src-4d877d82f1552d7aa7bcf6805170c4aa385ab0d4.tar.gz chromium_src-4d877d82f1552d7aa7bcf6805170c4aa385ab0d4.tar.bz2 | |
cc: Fix flaky LayerTreeHostTestFrameTimeUpdatesAfterActivationFails
This blocks NotifyReadyToActivate sooner, in BeginCommitOnThread.
It is possible for activation to occur before
WillBeginImplFrameOnThread, which is where NotifyReadyToActivate
was being blocked previously.
This also records first_frame_time_, which was accidentally removed
before.
LayerTreeHostTestFrameTimeUpdatesAfterActivationFails is
re-enabled now that it has been fixed.
BUG=304251
Review URL: https://codereview.chromium.org/26246004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 1 | ||||
| -rw-r--r-- | cc/test/layer_tree_test.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 6b78b25..87fcb54 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -76,6 +76,7 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE { test_hooks_->WillBeginImplFrameOnThread(this, args); LayerTreeHostImpl::BeginFrame(args); + test_hooks_->DidBeginImplFrameOnThread(this, args); } virtual void BeginCommit() OVERRIDE { diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h index 13bd4a9..c9e14d6 100644 --- a/cc/test/layer_tree_test.h +++ b/cc/test/layer_tree_test.h @@ -33,6 +33,8 @@ class TestHooks : public AnimationDelegate { virtual void WillBeginImplFrameOnThread(LayerTreeHostImpl* host_impl, const BeginFrameArgs& args) {} + virtual void DidBeginImplFrameOnThread(LayerTreeHostImpl* host_impl, + const BeginFrameArgs& args) {} virtual void BeginCommitOnThread(LayerTreeHostImpl* host_impl) {} virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) {} virtual void WillActivateTreeOnThread(LayerTreeHostImpl* host_impl) {} |